diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index 50dcca78ea55b86b0019e96221cd8820236846ee..fc5fa87f6b6c85e9de17e5faea648a8a4c951029 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -1,6 +1,6 @@
#
msgid ""
-msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-05-18 19:52+0200\nPO-Revision-Date: 2023-06-13 15:38+0000\nLast-Translator: Baptiste Vad챕 <baptiste.vade@hotmail.fr>\nLanguage-Team: LANGUAGE <LL@li.org>\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.18-dev\n"
+msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-05-18 19:52+0200\nPO-Revision-Date: 2023-08-05 16:31+0000\nLast-Translator: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage-Team: LANGUAGE <LL@li.org>\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 5.0-dev\n"
#. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:769 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:146 en/git-status.txt:31
@@ -1506,7 +1506,7 @@ msgstr "linkgit:git-diff-tree[1]"
#: en/cmds-plumbinginterrogators.txt:15
#, priority:100
msgid "Compares the content and mode of blobs found via two tree objects."
-msgstr "Comparer le contenu et le mode des blobs trouv챕s via deux objets arbre."
+msgstr "Compare le contenu et le mode des blobs trouv챕s via deux objets arbre."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:16
@@ -7428,7 +7428,7 @@ msgstr "Ne pas ajouter l'ent챗te Message-ID au message de validation. `no-messag
#: en/git-am.txt:91
#, priority:100
msgid "Be quiet. Only print error messages."
-msgstr "N'afficher que les messages d'erreur."
+msgstr "Mode silencieux. N'afficher que les messages d'erreur."
#. type: Labeled list
#: en/git-am.txt:93
@@ -7904,7 +7904,7 @@ msgstr "<rustine>..."
#: en/git-apply.txt:40
#, priority:100
msgid "The files to read the patch from. '-' can be used to read from the standard input."
-msgstr "Prendre le message de validation depuis le fichier indiqu챕. Utilisez '-' pour lire le message depuis l'entr챕e standard."
+msgstr "Prendre la rustine depuis le fichier indiqu챕. Utilisez '-' pour lire la rustine depuis l'entr챕e standard."
#. type: Labeled list
#: en/git-apply.txt:41 en/git-rebase.txt:415 en/merge-options.txt:107
@@ -10659,7 +10659,7 @@ msgstr "--no-contains [<commit>]"
#: en/git-branch.txt:294
#, priority:260
msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
-msgstr "N'indiquer que les branches qui contiennent le commit sp챕cifi챕 (HEAD si non sp챕cifi챕). Implique `--list`."
+msgstr "N'indiquer que les branches qui ne contiennent pas le commit sp챕cifi챕 (HEAD si non sp챕cifi챕). Implique `--list`."
#. type: Labeled list
#: en/git-branch.txt:295 en/git-tag.txt:154
@@ -10683,7 +10683,7 @@ msgstr "--no-merged [<commit>]"
#: en/git-branch.txt:302
#, priority:260
msgid "Only list branches whose tips are not reachable from the specified commit (HEAD if not specified). Implies `--list`."
-msgstr "N'indiquer que les branches dont les sommets sont accessibles depuis le commit sp챕cifi챕 (HEAD si non sp챕cifi챕). Implique `--list`."
+msgstr "N'indiquer que les branches dont les sommets ne sont pas accessibles depuis le commit sp챕cifi챕 (HEAD si non sp챕cifi챕). Implique `--list`."
#. type: Labeled list
#: en/git-branch.txt:303
@@ -16010,7 +16010,7 @@ msgstr "Lire le message de validation depuis le fichier indiqu챕. Utilisez '-' p
#: en/git-commit-tree.txt:69
#, priority:80
msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space. `--no-gpg-sign` is useful to countermand a `--gpg-sign` option given earlier on the command line."
-msgstr "Signer les commits avec GPG. L'argument `idcl챕` est optionnel avec par d챕faut l'identit챕 du validateur혻; si sp챕cifi챕e, elle doit 챗tre coll챕e 횪 l'option sans aucun espace. `--no-gpg-sign` est utile pour annuler l'effet de la variable de configuration `commit.gpgSign` ainsi que tout `--gpg-sign` pr챕c챕dent."
+msgstr "Signer les commits avec GPG. L'argument `idcl챕` est optionnel avec par d챕faut l'identit챕 du validateur혻; si sp챕cifi챕e, elle doit 챗tre coll챕e 횪 l'option sans aucun espace. `--no-gpg-sign` est utile pour annuler l'effet de tout `--gpg-sign` pr챕c챕dent sur la ligne de commande."
#. type: Title -
#: en/git-commit-tree.txt:71
@@ -16808,11 +16808,7 @@ msgid ""
"unmerged: hello.c\n"
"$ edit hello.c\n"
"$ git add hello.c\n"
-msgstr ""
-"$ git status | grep non-fusionn챕\n"
-"non-fusionn챕혻: hello.c\n"
-"$ edit hello.c\n"
-"$ git add hello.c\n"
+msgstr "$ git status | grep unmerged\nunmerged: hello.c\n$ edit hello.c\n$ git add hello.c\n"
#. type: Plain text
#: en/git-commit.txt:490
@@ -21605,7 +21601,7 @@ msgstr ""
#: en/git-diff-tree.txt:19
#, priority:80
msgid "Compares the content and mode of the blobs found via two tree objects."
-msgstr "Comparer le contenu et le mode des blobs trouv챕s via deux objets arbre."
+msgstr "Compare le contenu et le mode des blobs trouv챕s via deux objets arbre."
#. type: Plain text
#: en/git-diff-tree.txt:22
@@ -25143,7 +25139,7 @@ msgstr "L'URL du d챕p척t distant."
#: en/git-fetch-pack.txt:121
#, ignore-ellipsis, no-wrap, priority:90
msgid "<refs>..."
-msgstr "<r챕f>..."
+msgstr "<r챕fs>..."
#. type: Plain text
#: en/git-fetch-pack.txt:125
@@ -30744,31 +30740,31 @@ msgstr "Il v챕rifie que le r챕pertoire poss챔de le fichier magique \"git-daemon-
#: en/git-http-backend.txt:33
#, priority:100
msgid "By default, only the `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'. If the client is authenticated, the `receive-pack` service is enabled, which serves 'git send-pack' clients, which is invoked from 'git push'."
-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 횪 partir de 'git fetch', 'git pull', et 'git clone'. Si le client est authentifi챕, le service `receive-pack` est activ챕 et sert les clients 'git send-pack', qui sont invoqu챕s 횪 partir de 'git push'."
#. type: Plain text
#: en/git-http-backend.txt:38
-#, fuzzy, priority:100
+#, priority:100
msgid "These services can be enabled/disabled using the per-repository configuration file:"
-msgstr "Ces services peuvent 챗tre activ챕s/d챕sactiv챕s gr창ce au ficher de configuration par d챕p척t:"
+msgstr "Ces services peuvent 챗tre activ챕s/d챕sactiv챕s gr창ce au ficher de configuration par d챕p척t��:"
#. type: Labeled list
#: en/git-http-backend.txt:39
#, no-wrap, priority:100
msgid "http.getanyfile"
-msgstr ""
+msgstr "http.getanyfile"
#. type: Plain text
#: en/git-http-backend.txt:46
#, priority:100
msgid "This serves Git clients older than version 1.6.6 that are unable to use the upload pack service. When enabled, clients are able to read any file within the repository, including objects that are no longer reachable from a branch but are still present. It is enabled by default, but a repository can disable it by setting this configuration item to `false`."
-msgstr ""
+msgstr "Ceci sert les clients Git plus anciens que la version 1.6.6 qui ne sont pas en mesure d'utiliser le service de t챕l챕versement de paquet. Lorsqu'il est activ챕, les clients sont capables de lire n'importe quel fichier dans le d챕p척t, y compris les objets qui ne sont plus accessibles depuis une branche mais qui sont toujours pr챕sents. Il est activ챕 par d챕faut, mais un d챕p척t peut le d챕sactiver en mettant cet 챕l챕ment de configuration 횪 `false`."
#. type: Labeled list
#: en/git-http-backend.txt:47
#, no-wrap, priority:100
msgid "http.uploadpack"
-msgstr ""
+msgstr "http.uploadpack"
#. type: Plain text
#: en/git-http-backend.txt:51
@@ -30780,43 +30776,43 @@ msgstr "Cela sert aux clients 'git fetch-pack' et 'git ls-remote'. Il est activ
#: en/git-http-backend.txt:52
#, no-wrap, priority:100
msgid "http.receivepack"
-msgstr ""
+msgstr "http.receivepack"
#. type: Plain text
#: en/git-http-backend.txt:58
#, priority:100
msgid "This serves 'git send-pack' clients, allowing push. It is disabled by default for anonymous users, and enabled by default for users authenticated by the web server. It can be disabled by setting this item to `false`, or enabled for all users, including anonymous users, by setting it to `true`."
-msgstr ""
+msgstr "Ceci sert les clients 'git send-pack', permettant de pousser. Il est d챕sactiv챕 par d챕faut pour les utilisateurs anonymes, et activ챕 par d챕faut pour les utilisateurs authentifi챕s par le serveur web. Il peut 챗tre d챕sactiv챕 en mettant cet 챕l챕ment 횪 `false`, ou activ챕 pour tous les utilisateurs, y compris les utilisateurs anonymes, en le mettant 횪 `true`."
#. type: Title -
#: en/git-http-backend.txt:60
#, no-wrap, priority:100
msgid "URL TRANSLATION"
-msgstr ""
+msgstr "TRADUCTION D�셐RL"
#. type: Plain text
#: en/git-http-backend.txt:67
#, priority:100
msgid "To determine the location of the repository on disk, 'git http-backend' concatenates the environment variables PATH_INFO, which is set automatically by the web server, and GIT_PROJECT_ROOT, which must be set manually in the web server configuration. If GIT_PROJECT_ROOT is not set, 'git http-backend' reads PATH_TRANSLATED, which is also set automatically by the web server."
-msgstr ""
+msgstr "Pour d챕terminer l'emplacement du d챕p척t sur le disque, 'git http-backend' concat챔ne les variables d'environnement PATH_INFO, qui est d챕finie automatiquement par le serveur web, et GIT_PROJECT_ROOT, qui doit 챗tre d챕finie manuellement dans la configuration du serveur web. Si GIT_PROJECT_ROOT n'est pas d챕fini, 'git http-backend' lit PATH_TRANSLATED, qui est 챕galement d챕fini automatiquement par le serveur web."
#. type: Plain text
#: en/git-http-backend.txt:72
#, priority:100
msgid "All of the following examples map `http://$hostname/git/foo/bar.git` to `/var/www/git/foo/bar.git`."
-msgstr ""
+msgstr "Tous les exemples suivants font correspondre `http://$hostname/git/foo/bar.git` 횪 `/var/www/git/foo/bar.git`."
#. type: Labeled list
#: en/git-http-backend.txt:73
#, no-wrap, priority:100
msgid "Apache 2.x"
-msgstr ""
+msgstr "Apache 2.x"
#. type: Plain text
#: en/git-http-backend.txt:77
#, priority:100
msgid "Ensure mod_cgi, mod_alias, and mod_env are enabled, set GIT_PROJECT_ROOT (or DocumentRoot) appropriately, and create a ScriptAlias to the CGI:"
-msgstr ""
+msgstr "Assurez-vous que mod_cgi, mod_alias et mod_env sont activ챕s, d챕finissez GIT_PROJECT_ROOT (ou DocumentRoot) de mani챔re appropri챕e, et cr챕ez un ScriptAlias pour le CGI :"
#. type: delimited block -
#: en/git-http-backend.txt:82
@@ -30825,7 +30821,7 @@ msgid ""
"SetEnv GIT_PROJECT_ROOT /var/www/git\n"
"SetEnv GIT_HTTP_EXPORT_ALL\n"
"ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/\n"
-msgstr ""
+msgstr "SetEnv GIT_PROJECT_ROOT /var/www/git\nSetEnv GIT_HTTP_EXPORT_ALL\nScriptAlias /git/ /usr/libexec/git-core/git-http-backend/\n"
#. type: delimited block -
#: en/git-http-backend.txt:94
@@ -30842,13 +30838,13 @@ msgid ""
"# modern versions (and will take precedence over HTTP_GIT_PROTOCOL,\n"
"# which means it can be used to override the client's request).\n"
"SetEnvIf Git-Protocol \".*\" GIT_PROTOCOL=$0\n"
-msgstr ""
+msgstr "# Ce n'est pas strictement n챕cessaire avec Apache et une version moderne de\n# git-http-backend, car le serveur web transmettra l'en-t챗te dans l'environnement\n# l'environnement en tant que HTTP_GIT_PROTOCOL, et http-backend le copiera dans\n# GIT_PROTOCOL. Mais vous pouvez avoir besoin de cette ligne (ou quelque chose de similaire si vous\n# utilisez un serveur web diff챕rent), ou si vous voulez supporter d'anciennes versions de Git\n# qui ne faisaient pas cette copie.\n#\n# Avoir le serveur web qui met en place GIT_PROTOCOL est tout 횪 fait acceptable m챗me avec les\n# versions modernes (et aura la priorit챕 sur HTTP_GIT_PROTOCOL,\n# ce qui signifie qu'il peut 챗tre utilis챕 pour passer outre la demande du client).\nSetEnvIf Git-Protocol \".*\" GIT_PROTOCOL=$0\n"
#. type: Plain text
#: en/git-http-backend.txt:100
#, priority:100
msgid "To enable anonymous read access but authenticated write access, require authorization for both the initial ref advertisement (which we detect as a push via the service parameter in the query string), and the receive-pack invocation itself:"
-msgstr ""
+msgstr "Pour permettre un acc챔s anonyme en lecture mais un acc챔s authentifi챕 en 챕criture, il faut une autorisation 횪 la fois pour l'annonce initiale (que nous d챕tectons comme une pouss챕e via le param챔tre de service dans la cha챤ne de requ챗te) et pour l'invocation de receive-pack lui-m챗me :"
#. type: delimited block -
#: en/git-http-backend.txt:105
@@ -30857,7 +30853,7 @@ msgid ""
"RewriteCond %{QUERY_STRING} service=git-receive-pack [OR]\n"
"RewriteCond %{REQUEST_URI} /git-receive-pack$\n"
"RewriteRule ^/git/ - [E=AUTHREQUIRED:yes]\n"
-msgstr ""
+msgstr "RewriteCond %{QUERY_STRING} service=git-receive-pack [OR]\nRewriteCond %{REQUEST_URI} /git-receive-pack$\nRewriteRule ^/git/ - [E=AUTHREQUIRED:yes]\n"
#. type: delimited block -
#: en/git-http-backend.txt:109
@@ -30866,7 +30862,7 @@ msgid ""
"<LocationMatch \"^/git/\">\n"
"\tOrder Deny,Allow\n"
"\tDeny from env=AUTHREQUIRED\n"
-msgstr ""
+msgstr "<LocationMatch \"^/git/\">\n\tOrder Deny,Allow\n\tDeny from env=AUTHREQUIRED\n"
#. type: delimited block -
#: en/git-http-backend.txt:116
@@ -30878,13 +30874,13 @@ msgid ""
"\tSatisfy Any\n"
"\t...\n"
"</LocationMatch>\n"
-msgstr ""
+msgstr "\tAuthType Basic\n\tAuthName \"Git Access\"\n\tRequire group committers\n\tSatisfy Any\n\t...\n</LocationMatch>\n"
#. type: Plain text
#: en/git-http-backend.txt:121
#, priority:100
msgid "If you do not have `mod_rewrite` available to match against the query string, it is sufficient to just protect `git-receive-pack` itself, like:"
-msgstr ""
+msgstr "Si vous n'avez pas `mod_rewrite` disponible pour tester la correspondance de la cha챤ne de requ챗te, il est suffisant de prot챕ger `git-receive-pack` lui-m챗me, comme :"
#. type: delimited block -
#: en/git-http-backend.txt:129
@@ -30896,19 +30892,19 @@ msgid ""
"\tRequire group committers\n"
"\t...\n"
"</LocationMatch>\n"
-msgstr ""
+msgstr "<LocationMatch \"^/git/.*/git-receive-pack$\">\n\tAuthType Basic\n\tAuthName \"Git Access\"\n\tRequire group committers\n\t...\n</LocationMatch>\n"
#. type: Plain text
#: en/git-http-backend.txt:139
#, priority:100
msgid "In this mode, the server will not request authentication until the client actually starts the object negotiation phase of the push, rather than during the initial contact. For this reason, you must also enable the `http.receivepack` config option in any repositories that should accept a push. The default behavior, if `http.receivepack` is not set, is to reject any pushes by unauthenticated users; the initial request will therefore report `403 Forbidden` to the client, without even giving an opportunity for authentication."
-msgstr ""
+msgstr "Dans ce mode, le serveur ne demandera pas d'authentification avant que le client ne commence la phase de n챕gociation de l'objet de la pouss챕e, plut척t que lors du contact initial. Pour cette raison, vous devez 챕galement activer l'option de configuration `http.receivepack` dans tous les d챕p척ts qui devraient accepter une pouss챕e. Le comportement par d챕faut, si `http.receivepack` n'est pas activ챕, est de rejeter toute pouss챕e par des utilisateurs non authentifi챕s ; la requ챗te initiale rapportera donc `403 Forbidden` au client, sans m챗me lui donner l'opportunit챕 de s'authentifier."
#. type: Plain text
#: en/git-http-backend.txt:142
#, priority:100
msgid "To require authentication for both reads and writes, use a Location directive around the repository, or one of its parent directories:"
-msgstr ""
+msgstr "Pour exiger l'authentification 횪 la fois pour les lectures et les 챕critures, utilisez une directive Location autour du d챕p척t ou de l'un de ses r챕pertoires parents :"
#. type: delimited block -
#: en/git-http-backend.txt:150
@@ -30920,13 +30916,13 @@ msgid ""
"\tRequire group committers\n"
"\t...\n"
"</Location>\n"
-msgstr ""
+msgstr "<Location /git/private>\n\tAuthType Basic\n\tAuthName \"Private Git Access\"\n\tRequire group committers\n\t...\n</Location>\n"
#. type: Plain text
#: en/git-http-backend.txt:155
#, priority:100
msgid "To serve gitweb at the same url, use a ScriptAliasMatch to only those URLs that 'git http-backend' can handle, and forward the rest to gitweb:"
-msgstr ""
+msgstr "Pour servir gitweb 횪 la m챗me url, utilisez un ScriptAliasMatch uniquement pour les URLs que 'git http-backend' peut g챕rer, et transf챕rez le reste 횪 gitweb :"
#. type: delimited block -
#: en/git-http-backend.txt:165
@@ -30940,19 +30936,19 @@ msgid ""
"\t\t\t\t pack/pack-[0-9a-f]{40}\\.(pack|idx)) | \\\n"
"\t\t\tgit-(upload|receive)-pack))$\" \\\n"
"\t/usr/libexec/git-core/git-http-backend/$1\n"
-msgstr ""
+msgstr "ScriptAliasMatch \\\n\t\"(?x)^/git/(.*/(HEAD | \\\n\t\t\tinfo/refs | \\\n\t\t\tobjects/(info/[^/]+ | \\\n\t\t\t\t [0-9a-f]{2}/[0-9a-f]{38} | \\\n\t\t\t\t pack/pack-[0-9a-f]{40}\\.(pack|idx)) | \\\n\t\t\tgit-(upload|receive)-pack))$\" \\\n\t/usr/libexec/git-core/git-http-backend/$1\n"
#. type: delimited block -
#: en/git-http-backend.txt:167
#, no-wrap, priority:100
msgid "ScriptAlias /git/ /var/www/cgi-bin/gitweb.cgi/\n"
-msgstr ""
+msgstr "ScriptAlias /git/ /var/www/cgi-bin/gitweb.cgi/\n"
#. type: Plain text
#: en/git-http-backend.txt:171
#, priority:100
msgid "To serve multiple repositories from different linkgit:gitnamespaces[7] in a single repository:"
-msgstr ""
+msgstr "Pour servir plusieurs d챕p척ts de diff챕rents espaces linkgit:gitnamespaces[7] dans un seul d챕p척t :"
#. type: delimited block -
#: en/git-http-backend.txt:175
@@ -30960,25 +30956,25 @@ msgstr ""
msgid ""
"SetEnvIf Request_URI \"^/git/([^/]*)\" GIT_NAMESPACE=$1\n"
"ScriptAliasMatch ^/git/[^/]*(.*) /usr/libexec/git-core/git-http-backend/storage.git$1\n"
-msgstr ""
+msgstr "SetEnvIf Request_URI \"^/git/([^/]*)\" GIT_NAMESPACE=$1\nScriptAliasMatch ^/git/[^/]*(.*) /usr/libexec/git-core/git-http-backend/storage.git$1\n"
#. type: Labeled list
#: en/git-http-backend.txt:177
#, no-wrap, priority:100
msgid "Accelerated static Apache 2.x"
-msgstr ""
+msgstr "Apache 2.x statique acc챕l챕r챕"
#. type: Plain text
#: en/git-http-backend.txt:182
#, priority:100
msgid "Similar to the above, but Apache can be used to return static files that are stored on disk. On many systems this may be more efficient as Apache can ask the kernel to copy the file contents from the file system directly to the network:"
-msgstr ""
+msgstr "Similaire 횪 ci-dessus, mais Apache peut 챗tre utilis챕 pour renvoyer des fichiers statiques stock챕s sur le disque. Sur de nombreux syst챔mes, cela peut 챗tre plus efficace car Apache peut demander au noyau de copier le contenu du fichier depuis le syst챔me de fichiers directement sur le r챕seau :"
#. type: delimited block -
#: en/git-http-backend.txt:185 en/git-http-backend.txt:195
#, no-wrap, priority:100
msgid "SetEnv GIT_PROJECT_ROOT /var/www/git\n"
-msgstr ""
+msgstr "SetEnv GIT_PROJECT_ROOT /var/www/git\n"
#. type: delimited block -
#: en/git-http-backend.txt:189
@@ -30987,13 +30983,13 @@ msgid ""
"AliasMatch ^/git/(.*/objects/[0-9a-f]{2}/[0-9a-f]{38})$ /var/www/git/$1\n"
"AliasMatch ^/git/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ /var/www/git/$1\n"
"ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/\n"
-msgstr ""
+msgstr "AliasMatch ^/git/(.*/objects/[0-9a-f]{2}/[0-9a-f]{38})$ /var/www/git/$1\nAliasMatch ^/git/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ /var/www/git/$1\nScriptAlias /git/ /usr/libexec/git-core/git-http-backend/\n"
#. type: Plain text
#: en/git-http-backend.txt:192
#, priority:100
msgid "This can be combined with the gitweb configuration:"
-msgstr ""
+msgstr "Ceci peut 챗tre combin챕 avec la configuration de gitweb :"
#. type: delimited block -
#: en/git-http-backend.txt:205
@@ -31008,19 +31004,19 @@ msgid ""
"\t\t\tgit-(upload|receive)-pack))$\" \\\n"
"\t/usr/libexec/git-core/git-http-backend/$1\n"
"ScriptAlias /git/ /var/www/cgi-bin/gitweb.cgi/\n"
-msgstr ""
+msgstr "AliasMatch ^/git/(.*/objects/[0-9a-f]{2}/[0-9a-f]{38})$ /var/www/git/$1\nAliasMatch ^/git/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ /var/www/git/$1\nScriptAliasMatch \\\n\t\"(?x)^/git/(.*/(HEAD | \\\n\t\t\tinfo/refs | \\\n\t\t\tobjects/info/[^/]+ | \\\n\t\t\tgit-(upload|receive)-pack))$\" \\\n\t/usr/libexec/git-core/git-http-backend/$1\nScriptAlias /git/ /var/www/cgi-bin/gitweb.cgi/\n"
#. type: Labeled list
#: en/git-http-backend.txt:207
#, no-wrap, priority:100
msgid "Lighttpd"
-msgstr ""
+msgstr "Lighttpd"
#. type: Plain text
#: en/git-http-backend.txt:211
#, priority:100
msgid "Ensure that `mod_cgi`, `mod_alias`, `mod_auth`, `mod_setenv` are loaded, then set `GIT_PROJECT_ROOT` appropriately and redirect all requests to the CGI:"
-msgstr ""
+msgstr "Assurez-vous que `mod_cgi`, `mod_alias`, `mod_auth`, `mod_setenv` sont charg챕s, puis d챕finissez `GIT_PROJECT_ROOT` de mani챔re appropri챕e et redirigez toutes les requ챗tes vers le CGI :"
#. type: delimited block -
#: en/git-http-backend.txt:221
@@ -31034,13 +31030,13 @@ msgid ""
"\t\t\"GIT_HTTP_EXPORT_ALL\" => \"\"\n"
"\t)\n"
"}\n"
-msgstr ""
+msgstr "alias.url += ( \"/git\" => \"/usr/lib/git-core/git-http-backend\" )\n$HTTP[\"url\"] =~ \"^/git\" {\n\tcgi.assign = (\"\" => \"\")\n\tsetenv.add-environment = (\n\t\t\"GIT_PROJECT_ROOT\" => \"/var/www/git\",\n\t\t\"GIT_HTTP_EXPORT_ALL\" => \"\"\n\t)\n}\n"
#. type: Plain text
#: en/git-http-backend.txt:224
#, priority:100
msgid "To enable anonymous read access but authenticated write access:"
-msgstr ""
+msgstr "Pour permettre un acc챔s anonyme en lecture mais un acc챔s authentifi챕 en 챕criture :"
#. type: delimited block -
#: en/git-http-backend.txt:232
@@ -31052,13 +31048,13 @@ msgid ""
"$HTTP[\"url\"] =~ \"^/git/.*/git-receive-pack$\" {\n"
"\tinclude \"git-auth.conf\"\n"
"}\n"
-msgstr ""
+msgstr "$HTTP[\"querystring\"] =~ \"service=git-receive-pack\" {\n\tinclude \"git-auth.conf\"\n}\n$HTTP[\"url\"] =~ \"^/git/.*/git-receive-pack$\" {\n\tinclude \"git-auth.conf\"\n}\n"
#. type: Plain text
#: en/git-http-backend.txt:235
#, priority:100
msgid "where `git-auth.conf` looks something like:"
-msgstr ""
+msgstr "o첫 `git-auth.conf` ressemble 횪 quelque chose comme :"
#. type: delimited block -
#: en/git-http-backend.txt:245
@@ -31072,13 +31068,13 @@ msgid ""
"\t )\n"
")\n"
"# ...and set up auth.backend here\n"
-msgstr ""
+msgstr "auth.require = (\n\t\"/\" => (\n\t\t\"method\" => \"basic\",\n\t\t\"realm\" => \"Git Access\",\n\t\t\"require\" => \"valid-user\"\n\t )\n)\n# ...et configurer auth.backend ici\n"
#. type: Plain text
#: en/git-http-backend.txt:248
#, priority:100
msgid "To require authentication for both reads and writes:"
-msgstr ""
+msgstr "Pour exiger une authentification 횪 la fois pour les lectures et les 챕critures :"
#. type: delimited block -
#: en/git-http-backend.txt:253
@@ -31087,79 +31083,79 @@ msgid ""
"$HTTP[\"url\"] =~ \"^/git/private\" {\n"
"\tinclude \"git-auth.conf\"\n"
"}\n"
-msgstr ""
+msgstr "$HTTP[\"url\"] =~ \"^/git/private\" {\n\tinclude \"git-auth.conf\"\n}\n"
#. type: Plain text
#: en/git-http-backend.txt:260
#, priority:100
msgid "'git http-backend' relies upon the `CGI` environment variables set by the invoking web server, including:"
-msgstr ""
+msgstr "'git http-backend' s�셙ppuie sur les variables d�셞nvironnement `CGI` d챕finies par le serveur web appelant, notamment :"
#. type: Plain text
#: en/git-http-backend.txt:262
#, priority:100
msgid "PATH_INFO (if GIT_PROJECT_ROOT is set, otherwise PATH_TRANSLATED)"
-msgstr ""
+msgstr "PATH_INFO (si GIT_PROJECT_ROOT est d챕fini, sinon PATH_TRANSLATED)"
#. type: Plain text
#: en/git-http-backend.txt:263
#, priority:100
msgid "REMOTE_USER"
-msgstr ""
+msgstr "REMOTE_USER"
#. type: Plain text
#: en/git-http-backend.txt:264
#, priority:100
msgid "REMOTE_ADDR"
-msgstr ""
+msgstr "REMOTE_ADDR"
#. type: Plain text
#: en/git-http-backend.txt:265
#, priority:100
msgid "CONTENT_TYPE"
-msgstr ""
+msgstr "CONTENT_TYPE"
#. type: Plain text
#: en/git-http-backend.txt:266
#, priority:100
msgid "QUERY_STRING"
-msgstr ""
+msgstr "QUERY_STRING"
#. type: Plain text
#: en/git-http-backend.txt:267
#, priority:100
msgid "REQUEST_METHOD"
-msgstr ""
+msgstr "REQUEST_METHOD"
#. type: Plain text
#: en/git-http-backend.txt:271
#, priority:100
msgid "The `GIT_HTTP_EXPORT_ALL` environmental variable may be passed to 'git-http-backend' to bypass the check for the \"git-daemon-export-ok\" file in each repository before allowing export of that repository."
-msgstr ""
+msgstr "La variable d'environnement `GIT_HTTP_EXPORT_ALL` peut 챗tre pass챕e 횪 'git-http-backend' pour contourner la v챕rification du fichier \"git-daemon-export-ok\" dans chaque d챕p척t avant d'autoriser l'exportation de ce d챕p척t."
#. type: Plain text
#: en/git-http-backend.txt:280
#, priority:100
msgid "The `GIT_HTTP_MAX_REQUEST_BUFFER` environment variable (or the `http.maxRequestBuffer` config variable) may be set to change the largest ref negotiation request that git will handle during a fetch; any fetch requiring a larger buffer will not succeed. This value should not normally need to be changed, but may be helpful if you are fetching from a repository with an extremely large number of refs. The value can be specified with a unit (e.g., `100M` for 100 megabytes). The default is 10 megabytes."
-msgstr ""
+msgstr "La variable d'environnement `GIT_HTTP_MAX_REQUEST_BUFFER` (ou la variable de configuration `http.maxRequestBuffer`) peut 챗tre d챕finie pour changer la plus grande requ챗te de n챕gociation de refs que git traitera pendant une r챕cup챕ration ; toute r챕cup챕ration n챕cessitant un tampon plus grand n'aboutira pas. Cette valeur n'a normalement pas besoin d'챗tre modifi챕e, mais peut 챗tre utile si vous r챕cup챕rez des donn챕es d'un d챕p척t avec un tr챔s grand nombre de refs. La valeur peut 챗tre sp챕cifi챕e avec une unit챕 (par exemple, `100M` pour 100 m챕gaoctets). La valeur par d챕faut est de 10 m챕gaoctets."
#. type: Plain text
#: en/git-http-backend.txt:290
#, priority:100
msgid "Clients may probe for optional protocol capabilities (like the v2 protocol) using the `Git-Protocol` HTTP header. In order to support these, the contents of that header must appear in the `GIT_PROTOCOL` environment variable. Most webservers will pass this header to the CGI via the `HTTP_GIT_PROTOCOL` variable, and `git-http-backend` will automatically copy that to `GIT_PROTOCOL`. However, some webservers may be more selective about which headers they'll pass, in which case they need to be configured explicitly (see the mention of `Git-Protocol` in the Apache config from the earlier EXAMPLES section)."
-msgstr ""
+msgstr "Les clients peuvent rechercher des capacit챕s optionnelles du protocole (comme le protocole v2) en utilisant l'en-t챗te HTTP `Git-Protocol`. Afin de les prendre en charge, le contenu de cet en-t챗te doit appara챤tre dans la variable d'environnement `GIT_PROTOCOL`. La plupart des serveurs web passeront cet en-t챗te au CGI via la variable `HTTP_GIT_PROTOCOL`, et `git-http-backend` le copiera automatiquement dans `GIT_PROTOCOL`. Cependant, certains serveurs web peuvent 챗tre plus s챕lectifs sur les en-t챗tes qu'ils passent, dans ce cas ils doivent 챗tre configur챕s explicitement (voir la mention de `Git-Protocol` dans la configuration d'Apache dans la section EXEMPLES pr챕c챕dente)."
#. type: Plain text
#: en/git-http-backend.txt:295
#, priority:100
msgid "The backend process sets GIT_COMMITTER_NAME to '$REMOTE_USER' and GIT_COMMITTER_EMAIL to '$\\{REMOTE_USER}@http.$\\{REMOTE_ADDR\\}', ensuring that any reflogs created by 'git-receive-pack' contain some identifying information of the remote user who performed the push."
-msgstr ""
+msgstr "Le processus de backend d챕finit GIT_COMMITTER_NAME 횪 '$REMOTE_USER' et GIT_COMMITTER_EMAIL 횪 '$\\{REMOTE_USER}@http.$\\{REMOTE_ADDR\\}', s'assurant que tous les reflogs cr챕챕s par 'git-receive-pack' contiennent des informations d'identification de l'utilisateur distant qui a effectu챕 la pouss챕e."
#. type: Plain text
#: en/git-http-backend.txt:298
#, priority:100
msgid "All `CGI` environment variables are available to each of the hooks invoked by the 'git-receive-pack'."
-msgstr ""
+msgstr "Toutes les variables d'environnement `CGI` sont disponibles pour chacun des crochets invoqu챕s par 'git-receive-pack'."
#. type: Title =
#: en/git-http-fetch.txt:2
@@ -31177,7 +31173,7 @@ msgstr "git-http-fetch - T챕l챕charger depuis un d챕p척t Git distant via HTTP"
#: en/git-http-fetch.txt:13
#, no-wrap, priority:100
msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
-msgstr ""
+msgstr "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <fichier>] [--recover] [--stdin | --packfile=<empreinte> | <commit>] <URL>\n"
#. type: Plain text
#: en/git-http-fetch.txt:17
@@ -31189,7 +31185,7 @@ msgstr "T챕l챕charger un d챕p척t Git distant via HTTP."
#: en/git-http-fetch.txt:21
#, priority:100
msgid "This command always gets all objects. Historically, there were three options `-a`, `-c` and `-t` for choosing which objects to download. They are now silently ignored."
-msgstr ""
+msgstr "Cette commande r챕cup챔re toujours tous les objets. Historiquement, il y avait trois options `-a`, `-c` et `-t` pour choisir les objets 횪 t챕l챕charger. Elles sont maintenant silencieusement ignor챕es."
#. type: Labeled list
#: en/git-http-fetch.txt:24
@@ -31201,25 +31197,25 @@ msgstr "id-de-commit"
#: en/git-http-fetch.txt:27
#, priority:100
msgid "Either the hash or the filename under [URL]/refs/ to pull."
-msgstr ""
+msgstr "Soit le hachage, soit le nom de fichier sous [URL]/refs/ 횪 extraire."
#. type: Labeled list
#: en/git-http-fetch.txt:28
#, no-wrap, priority:100
msgid "-a, -c, -t"
-msgstr ""
+msgstr "-a, -c, -t"
#. type: Plain text
#: en/git-http-fetch.txt:30
#, priority:100
msgid "These options are ignored for historical reasons."
-msgstr ""
+msgstr "Ces options sont ignor챕es pour des raisons historiques."
#. type: Plain text
#: en/git-http-fetch.txt:32
#, priority:100
msgid "Report what is downloaded."
-msgstr ""
+msgstr "Signaler ce qui est t챕l챕charg챕."
#. type: Labeled list
#: en/git-http-fetch.txt:33
@@ -31231,19 +31227,19 @@ msgstr "-w <fichier>"
#: en/git-http-fetch.txt:36
#, priority:100
msgid "Writes the commit-id into the filename under $GIT_DIR/refs/<filename> on the local end after the transfer is complete."
-msgstr ""
+msgstr "횋crit l'identifiant du commit dans le fichier sous $GIT_DIR/refs/<nom-de-fichier> du c척t챕 local une fois le transfert termin챕."
#. type: Plain text
#: en/git-http-fetch.txt:40
#, priority:100
msgid "Instead of a commit id on the command line (which is not expected in this case), 'git http-fetch' expects lines on stdin in the format"
-msgstr ""
+msgstr "Au lieu d�셵n id de commit sur la ligne de commande (ce qui n�셞st pas attendu dans ce cas), 'git http-fetch' attend des lignes sur stdin au format"
#. type: Plain text
#: en/git-http-fetch.txt:42
#, no-wrap, priority:100
msgid "<commit-id>['\\t'<filename-as-in--w>]\n"
-msgstr ""
+msgstr "<id-de-commit>['\\t'<nom-de-fichier-comme-avec--w>]\n"
#. type: Labeled list
#: en/git-http-fetch.txt:43
@@ -31255,7 +31251,7 @@ msgstr "--packfile=<empreinte>"
#: en/git-http-fetch.txt:51
#, priority:100
msgid "For internal use only. Instead of a commit id on the command line (which is not expected in this case), 'git http-fetch' fetches the packfile directly at the given URL and uses index-pack to generate corresponding .idx and .keep files. The hash is used to determine the name of the temporary file and is arbitrary. The output of index-pack is printed to stdout. Requires --index-pack-args."
-msgstr ""
+msgstr "Pour usage interne uniquement. Au lieu d�셵n id de commit sur la ligne de commande (ce qui n�셞st pas attendu dans ce cas), 'git http-fetch' r챕cup챔re le fichier de pack directement 횪 l�셐RL donn챕e et utilise index-pack pour g챕n챕rer les fichiers .idx et .keep correspondants. Le hachage est utilis챕 pour d챕terminer le nom du fichier temporaire et est arbitraire. La sortie de index-pack est affich챕e sur stdout. N챕cessite --index-pack-args."
#. type: Labeled list
#: en/git-http-fetch.txt:52
@@ -31267,7 +31263,7 @@ msgstr "--index-pack-args=<args>"
#: en/git-http-fetch.txt:55
#, priority:100
msgid "For internal use only. The command to run on the contents of the downloaded pack. Arguments are URL-encoded separated by spaces."
-msgstr ""
+msgstr "A usage interne uniquement. La commande 횪 ex챕cuter sur le contenu du pacquet t챕l챕charg챕. Les arguments sont cod챕s en URL et s챕par챕s par des espaces."
#. type: Labeled list
#: en/git-http-fetch.txt:56
@@ -31279,7 +31275,7 @@ msgstr "--recover"
#: en/git-http-fetch.txt:59
#, priority:100
msgid "Verify that everything reachable from target is fetched. Used after an earlier fetch is interrupted."
-msgstr ""
+msgstr "V챕rifier que tout ce qui peut 챗tre atteint 횪 partir de la cible est r챕cup챕r챕. Utilis챕 apr챔s l'interruption d'une r챕cup챕ration ant챕rieure."
#. type: Title =
#: en/git-http-push.txt:2
@@ -31297,13 +31293,13 @@ msgstr "git-http-push - Pousse des objets via HTTP/DAV sur un autre d챕p척t"
#: en/git-http-push.txt:13
#, ignore-ellipsis, no-wrap, priority:100
msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n"
-msgstr ""
+msgstr "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <r챕f> [<r챕f>...]\n"
#. type: Plain text
#: en/git-http-push.txt:18
#, priority:100
msgid "Sends missing objects to remote repository, and updates the remote branch."
-msgstr ""
+msgstr "Envoyez des objets manquants au d챕p척t distant et met 횪 jour la branche distante."
#. type: Plain text
#: en/git-http-push.txt:22
@@ -31312,19 +31308,19 @@ msgid ""
"*NOTE*: This command is temporarily disabled if your libcurl\n"
"is older than 7.16, as the combination has been reported\n"
"not to work and sometimes corrupts repository.\n"
-msgstr ""
+msgstr "*NOTE* : Cette commande est temporairement d챕sactiv챕e si votre libcurl\nest ant챕rieure 횪 la version 7.16, car il a 챕t챕 rapport챕 que la combinaison\nne fonctionne pas et corrompt parfois le d챕p척t.\n"
#. type: Plain text
#: en/git-http-push.txt:29
#, priority:100
msgid "Do not assume that the remote repository is complete in its current state, and verify all objects in the entire local ref's history exist in the remote repository."
-msgstr ""
+msgstr "Ne pas supposer que le d챕p척t distant est complet dans son 챕tat actuel et v챕rifier que tous les objets de l'historique du d챕p척t local existent dans le d챕p척t distant."
#. type: Plain text
#: en/git-http-push.txt:36 en/git-send-pack.txt:61
#, priority:100
msgid "Usually, the command refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it. This flag disables the check. What this means is that the remote repository can lose commits; use it with care."
-msgstr ""
+msgstr "En g챕n챕ral, la commande refuse de mettre 횪 jour une r챕f챕rence distante qui n'est pas un anc챗tre de la r챕f챕rence locale utilis챕e pour l'챕craser. Ce drapeau d챕sactive cette v챕rification. Cela signifie que le d챕p척t distant peut perdre des commits ; 횪 utiliser avec pr챕caution."
#. type: Plain text
#: en/git-http-push.txt:39 en/git-push.txt:176 en/git-send-pack.txt:54
@@ -31336,31 +31332,31 @@ msgstr "Fait tout sauf envoyer les mises 횪 jour."
#: en/git-http-push.txt:43
#, priority:100
msgid "Report the list of objects being walked locally and the list of objects successfully sent to the remote repository."
-msgstr ""
+msgstr "Signaler la liste des objets en cours d'acheminement localement et la liste des objets envoy챕s avec succ챔s vers le d챕p척t distant."
#. type: Plain text
#: en/git-http-push.txt:49
#, priority:100
msgid "Remove <ref> from remote repository. The specified branch cannot be the remote HEAD. If -d is specified the following other conditions must also be met:"
-msgstr ""
+msgstr "Supprime <r챕f> du d챕p척t distant. La branche sp챕cifi챕e ne peut pas 챗tre la branche HEAD distante. Si -d est sp챕cifi챕, les autres conditions suivantes doivent 챕galement 챗tre remplies :"
#. type: Plain text
#: en/git-http-push.txt:51
#, priority:100
msgid "Remote HEAD must resolve to an object that exists locally"
-msgstr ""
+msgstr "HEAD distant doit se r챕soudre 횪 un objet qui existe localement"
#. type: Plain text
#: en/git-http-push.txt:52
#, priority:100
msgid "Specified branch resolves to an object that exists locally"
-msgstr ""
+msgstr "La branche sp챕cifi챕e se r챕sout en un objet qui existe localement"
#. type: Plain text
#: en/git-http-push.txt:53
#, priority:100
msgid "Specified branch is an ancestor of the remote HEAD"
-msgstr ""
+msgstr "La branche sp챕cifi챕e est un anc챗tre de la branche distante HEAD"
#. type: Labeled list
#: en/git-http-push.txt:54 en/git-send-pack.txt:99
@@ -31372,67 +31368,67 @@ msgstr "<r챕f>..."
#: en/git-http-push.txt:56 en/git-send-pack.txt:101
#, priority:100
msgid "The remote refs to update."
-msgstr ""
+msgstr "Les r챕f챕rences distantes 횪 mettre 횪 jour."
#. type: Title -
#: en/git-http-push.txt:59 en/git-send-pack.txt:104
#, no-wrap, priority:100
msgid "SPECIFYING THE REFS"
-msgstr ""
+msgstr "SP횋CIFICATION DES R횋F횋RENCES"
#. type: Plain text
#: en/git-http-push.txt:65
#, priority:100
msgid "A '<ref>' specification can be either a single pattern, or a pair of such patterns separated by a colon \":\" (this means that a ref name cannot have a colon in it). A single pattern '<name>' is just a shorthand for '<name>:<name>'."
-msgstr ""
+msgstr "Une sp챕cification '<ref>' peut 챗tre soit un motif unique, soit une paire de motifs s챕par챕s par deux points \":\" (cela signifie qu'un nom de ref ne peut pas contenir de deux points). Un motif unique '<nom>' est une abr챕viation de '<nom>:<nom>'."
#. type: Plain text
#: en/git-http-push.txt:70
#, priority:100
msgid "Each pattern pair '<src>:<dst>' consists of the source side (before the colon) and the destination side (after the colon). The ref to be pushed is determined by finding a match that matches the source side, and where it is pushed is determined by using the destination side."
-msgstr ""
+msgstr "Chaque paire de motifs \"<src>:<dst>\" se compose du c척t챕 source (avant les deux points) et du c척t챕 destination (apr챔s les deux points). La r챕f 횪 pousser est d챕termin챕e par la recherche d'une correspondance avec le c척t챕 source, et l'endroit o첫 il est pouss챕 est d챕termin챕 en utilisant le c척t챕 destination."
#. type: Plain text
#: en/git-http-push.txt:73
#, priority:100
msgid "It is an error if '<src>' does not match exactly one of the local refs."
-msgstr ""
+msgstr "C�셞st une erreur si '<src>'ne correspond pas exactement 횪 l�셵ne des r챕f챕rences locales."
#. type: Plain text
#: en/git-http-push.txt:75
#, priority:100
msgid "If '<dst>' does not match any remote ref, either"
-msgstr ""
+msgstr "Si '<dst>' ne correspond 횪 aucune r챕f챕rence distante, soit"
#. type: Plain text
#: en/git-http-push.txt:78 en/git-send-pack.txt:139
#, priority:100
msgid "it has to start with \"refs/\"; <dst> is used as the destination literally in this case."
-msgstr ""
+msgstr "il doit commencer par \"refs/\" ; <dst> est utilis챕 comme destination litt챕rale dans ce cas."
#. type: Plain text
#: en/git-http-push.txt:82 en/git-send-pack.txt:143
#, priority:100
msgid "<src> == <dst> and the ref that matched the <src> must not exist in the set of remote refs; the ref matched <src> locally is used as the name of the destination."
-msgstr ""
+msgstr "<src> == <dst> et la ref qui correspond 횪 <src> ne doit pas exister dans l'ensemble des r챕fs distantes ; la r챕f qui correspond 횪 <src> localement est utilis챕e comme nom de la destination."
#. type: Plain text
#: en/git-http-push.txt:88 en/git-send-pack.txt:149
#, priority:100
msgid "Without `--force`, the <src> ref is stored at the remote only if <dst> does not exist, or <dst> is a proper subset (i.e. an ancestor) of <src>. This check, known as \"fast-forward check\", is performed in order to avoid accidentally overwriting the remote ref and lose other peoples' commits from there."
-msgstr ""
+msgstr "Sans `--force`, la r챕f <src> est stock챕e dans le distant seulement si <dst> n'existe pas, ou si <dst> est un sous-ensemble appropri챕 (c'est-횪-dire un anc챗tre) de <src>. Cette v챕rification, connue sous le nom de \"v챕rification d'avance rapide\", est effectu챕e afin d'챕viter d'챕craser accidentellement la r챕f distante et de perdre les commits d'autres personnes 횪 partir de l횪."
#. type: Plain text
#: en/git-http-push.txt:90 en/git-send-pack.txt:151
#, priority:100
msgid "With `--force`, the fast-forward check is disabled for all refs."
-msgstr ""
+msgstr "Avec `--force`, la v챕rification de l'avance rapide est d챕sactiv챕e pour toutes les r챕fs."
#. type: Plain text
#: en/git-http-push.txt:93 en/git-send-pack.txt:154
#, priority:100
msgid "Optionally, a <ref> parameter can be prefixed with a plus '+' sign to disable the fast-forward check only on that ref."
-msgstr ""
+msgstr "En option, un param챔tre <r챕f> peut 챗tre pr챕fix챕 par un signe plus '+' pour d챕sactiver la v챕rification de l'avance rapide uniquement sur cette r챕f챕rence."
#. type: Title =
#: en/git-imap-send.txt:2
@@ -31450,25 +31446,25 @@ msgstr "git-imap - Envoye un ensemble de rustines depuis stdin vers un r챕pertoi
#: en/git-imap-send.txt:13
#, no-wrap, priority:100
msgid "'git imap-send' [-v] [-q] [--[no-]curl]\n"
-msgstr ""
+msgstr "'git imap-send' [-v] [-q] [--[no-]curl]\n"
#. type: Plain text
#: en/git-imap-send.txt:23
#, priority:100
msgid "This command uploads a mailbox generated with 'git format-patch' into an IMAP drafts folder. This allows patches to be sent as other email is when using mail clients that cannot read mailbox files directly. The command also works with any general mailbox in which emails have the fields \"From\", \"Date\", and \"Subject\" in that order."
-msgstr ""
+msgstr "Cette commande t챕l챕charge une bo챤te aux lettres g챕n챕r챕e avec 'git format-patch' dans un dossier de brouillons IMAP. Cela permet d'envoyer les correctifs comme d'autres courriels lorsque l'on utilise des clients de messagerie qui ne peuvent pas lire directement les fichiers de bo챤tes aux lettres. La commande fonctionne 챕galement avec n'importe quelle bo챤te aux lettres g챕n챕rale dans laquelle les courriels comportent les champs \"From\", \"Date\" et \"Subject\" dans cet ordre."
#. type: Plain text
#: en/git-imap-send.txt:25
#, priority:100
msgid "Typical usage is something like:"
-msgstr ""
+msgstr "L'utilisation typique est quelque chose comme :"
#. type: Plain text
#: en/git-imap-send.txt:27
#, priority:100
msgid "git format-patch --signoff --stdout --attach origin | git imap-send"
-msgstr ""
+msgstr "git format-patch --signoff --stdout --attach origin | git imap-send"
#. type: Plain text
#: en/git-imap-send.txt:39
@@ -31486,7 +31482,7 @@ msgstr "--curl"
#: en/git-imap-send.txt:44
#, priority:100
msgid "Use libcurl to communicate with the IMAP server, unless tunneling into it. Ignored if Git was built without the USE_CURL_FOR_IMAP_SEND option set."
-msgstr ""
+msgstr "Utiliser libcurl pour communiquer avec le serveur IMAP, 횪 moins qu'il ne s'agisse d'un tunnel. Ignor챕 si Git a 챕t챕 compil챕 sans l'option USE_CURL_FOR_IMAP_SEND."
#. type: Labeled list
#: en/git-imap-send.txt:45
@@ -31498,19 +31494,19 @@ msgstr "--no-curl"
#: en/git-imap-send.txt:49
#, priority:100
msgid "Talk to the IMAP server using git's own IMAP routines instead of using libcurl. Ignored if Git was built with the NO_OPENSSL option set."
-msgstr ""
+msgstr "Communiquer avec le serveur IMAP en utilisant les propres routines IMAP de Git au lieu d'utiliser libcurl. Ignor챕 si Git a 챕t챕 compil챕 avec l'option NO_OPENSSL."
#. type: Plain text
#: en/git-imap-send.txt:56
#, priority:100
msgid "To use the tool, `imap.folder` and either `imap.tunnel` or `imap.host` must be set to appropriate values."
-msgstr ""
+msgstr "Pour utiliser l'outil, `imap.folder` et `imap.tunnel` ou `imap.host` doivent 챗tre r챕gl챕s sur les valeurs appropri챕es."
#. type: Plain text
#: en/git-imap-send.txt:64
#, priority:100
msgid "Using tunnel mode:"
-msgstr ""
+msgstr "Utilisation du mode tunnel :"
#. type: delimited block .
#: en/git-imap-send.txt:69
@@ -31519,13 +31515,13 @@ msgid ""
"[imap]\n"
" folder = \"INBOX.Drafts\"\n"
" tunnel = \"ssh -q -C user@example.com /usr/bin/imapd ./Maildir 2> /dev/null\"\n"
-msgstr ""
+msgstr "[imap]\n folder = \"INBOX.Drafts\"\n tunnel = \"ssh -q -C utilisateur@exemple.com /usr/bin/imapd ./Maildir 2> /dev/null\"\n"
#. type: Plain text
#: en/git-imap-send.txt:72
#, priority:100
msgid "Using direct mode:"
-msgstr ""
+msgstr "Utilisation du mode direct혻:"
#. type: delimited block .
#: en/git-imap-send.txt:79
@@ -31536,13 +31532,13 @@ msgid ""
" host = imap://imap.example.com\n"
" user = bob\n"
" pass = p4ssw0rd\n"
-msgstr ""
+msgstr "[imap]\n folder = \"INBOX.Drafts\"\n host = imap://imap.exemple.com\n user = bob\n pass = p4ssw0rd\n"
#. type: Plain text
#: en/git-imap-send.txt:82
#, priority:100
msgid "Using direct mode with SSL:"
-msgstr ""
+msgstr "Utilisation du mode direct avec SSL :"
#. type: delimited block .
#: en/git-imap-send.txt:91
@@ -31555,19 +31551,19 @@ msgid ""
" pass = p4ssw0rd\n"
" port = 123\n"
" ; sslVerify = false\n"
-msgstr ""
+msgstr "[imap]\n folder = \"INBOX.Drafts\"\n host = imaps://imap.exemple.com\n user = bob\n pass = p4ssw0rd\n port = 123\n ; sslVerify = false\n"
#. type: Plain text
#: en/git-imap-send.txt:100
#, priority:100
msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
-msgstr ""
+msgstr "Vous pouvez utiliser `sslVerify=false` pendant le d챕pannage, si vous pensez que la raison pour laquelle vous avez des difficult챕s 횪 vous connecter est que le certificat que vous utilisez sur le serveur priv챕 `exemple.com` que vous essayez de mettre en place (ou que vous avez mis en place) peut ne pas 챗tre v챕rifi챕 correctement."
#. type: Plain text
#: en/git-imap-send.txt:102
#, priority:100
msgid "Using Gmail's IMAP interface:"
-msgstr ""
+msgstr "Utilisation de l�셢nterface IMAP de Gmail :"
#. type: delimited block -
#: en/git-imap-send.txt:109
@@ -31578,49 +31574,49 @@ msgid ""
"\thost = imaps://imap.gmail.com\n"
"\tuser = user@gmail.com\n"
"\tport = 993\n"
-msgstr ""
+msgstr "[imap]\n\tfolder = \"[Gmail]/Drafts\"\n\thost = imaps://imap.gmail.com\n\tuser = user@gmail.com\n\tport = 993\n"
#. type: Plain text
#: en/git-imap-send.txt:114
#, priority:100
msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
-msgstr ""
+msgstr "Il se peut que vous deviez utiliser 횪 la place : `folder = \"[Google Mail]/Drafts\"` si vous obtenez une erreur indiquant que le \"Dossier n'existe pas\"."
#. type: Plain text
#: en/git-imap-send.txt:118
#, priority:100
msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
-msgstr ""
+msgstr "Si votre compte Gmail est configur챕 dans une autre langue que l'anglais, le nom du dossier \"Brouillons\" sera localis챕."
#. type: Plain text
#: en/git-imap-send.txt:120
#, priority:100
msgid "Once the commits are ready to be sent, run the following command:"
-msgstr ""
+msgstr "Une fois que les commandes sont pr챗tes 횪 챗tre envoy챕es, ex챕cutez la commande suivante :"
#. type: Plain text
#: en/git-imap-send.txt:122
#, no-wrap, priority:100
msgid " $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
-msgstr ""
+msgstr " $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
#. type: Plain text
#: en/git-imap-send.txt:126
#, priority:100
msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
-msgstr ""
+msgstr "Veillez simplement 횪 d챕sactiver le retour 횪 la ligne dans le client de messagerie (l'interface web de Gmail revient 횪 la ligne quoi qu'il arrive, vous devez donc utiliser un vrai client IMAP)."
#. type: Title -
#: en/git-imap-send.txt:128
#, no-wrap, priority:100
msgid "CAUTION"
-msgstr ""
+msgstr "ATTENTION"
#. type: Plain text
#: en/git-imap-send.txt:135
#, priority:100
msgid "It is still your responsibility to make sure that the email message sent by your email program meets the standards of your project. Many projects do not like patches to be attached. Some mail agents will transform patches (e.g. wrap lines, send them as format=flowed) in ways that make them fail. You will get angry flames ridiculing you if you don't check this."
-msgstr ""
+msgstr "Il est toujours de votre responsabilit챕 de vous assurer que le message 챕lectronique envoy챕 par votre programme de messagerie r챕pond aux normes de votre projet. De nombreux projets n'aiment pas que des correctifs soient joints. Certains agents de messagerie transforment les rustines (par exemple, en faisant passer les lignes, en les envoyant sous format=flowed) d'une mani챔re qui les fait 챕chouer. Si vous ne v챕rifiez pas cela, vous recevrez des flammes furieuses qui vous ridiculiseront."
#. type: Plain text
#: en/git-imap-send.txt:139
@@ -31629,7 +31625,7 @@ msgid ""
"Thunderbird in particular is known to be problematic. Thunderbird\n"
"users may wish to visit this web page for more information:\n"
" http://kb.mozillazine.org/Plain_text_e-mail_-_Thunderbird#Completely_plain_email\n"
-msgstr ""
+msgstr "Thunderbird, en particulier, est connu pour ses probl챔mes. Les utilisateurs de Thunderbird peuvent consulter cette page web pour plus d'informations :\n http://kb.mozillazine.org/Plain_text_e-mail_-_Thunderbird#Completely_plain_email\n"
#. type: Plain text
#: en/git-imap-send.txt:143
@@ -31656,31 +31652,31 @@ msgid ""
"'git index-pack' [-v] [-o <index-file>] [--[no-]rev-index] <pack-file>\n"
"'git index-pack' --stdin [--fix-thin] [--keep] [-v] [-o <index-file>]\n"
"\t\t [--[no-]rev-index] [<pack-file>]\n"
-msgstr ""
+msgstr "'git index-pack' [-v] [-o <fichier-index>] [--[no-]rev-index] <fichier-paquet>\n'git index-pack' --stdin [--fix-thin] [--keep] [-v] [-o <fichier-index>]\n\t\t [--[no-]rev-index] [<fichier-paquet>]\n"
#. type: Plain text
#: en/git-index-pack.txt:24
#, priority:100
msgid "Reads a packed archive (.pack) from the specified file, and builds a pack index file (.idx) for it. Optionally writes a reverse-index (.rev) for the specified pack. The packed archive together with the pack index can then be placed in the objects/pack/ directory of a Git repository."
-msgstr ""
+msgstr "Lit une archive compress챕e, un paquet (.pack) 횪 partir du fichier sp챕cifi챕, et construit un fichier d'indexation (.idx) pour cette archive. Optionnellement, 챕crit un index invers챕 (.rev) pour le paquet sp챕cifi챕. L'archive paquet ainsi que l'index du paquet peuvent ensuite 챗tre plac챕s dans le r챕pertoire objects/pack/ d'un d챕p척t Git."
#. type: Plain text
#: en/git-index-pack.txt:30
#, priority:100
msgid "Be verbose about what is going on, including progress status."
-msgstr ""
+msgstr "Mode loquace sur ce qui se passe, y compris sur l'챕tat d'avancement."
#. type: Labeled list
#: en/git-index-pack.txt:31
#, no-wrap, priority:100
msgid "-o <index-file>"
-msgstr ""
+msgstr "-o <fichier-index>"
#. type: Plain text
#: en/git-index-pack.txt:38
#, priority:100
msgid "Write the generated pack index into the specified file. Without this option the name of pack index file is constructed from the name of packed archive file by replacing .pack with .idx (and the program fails if the name of packed archive does not end with .pack)."
-msgstr ""
+msgstr "횋crit l'index de paquet g챕n챕r챕 dans le fichier sp챕cifi챕. Sans cette option, le nom du fichier d'index des paquet est construit 횪 partir du nom du fichier d'archive paquet en rempla챌ant .pack par .idx (et le programme 챕choue si le nom de l'archive paquet ne se termine pas par .pack)."
#. type: Labeled list
#: en/git-index-pack.txt:39
@@ -31692,13 +31688,13 @@ msgstr "--[no-]rev-index"
#: en/git-index-pack.txt:45
#, priority:100
msgid "When this flag is provided, generate a reverse index (a `.rev` file) corresponding to the given pack. If `--verify` is given, ensure that the existing reverse index is correct. Takes precedence over `pack.writeReverseIndex`."
-msgstr ""
+msgstr "Lorsque ce drapeau est fourni, g챕n챔rer un index invers챕 (un fichier `.rev`) correspondant au paquet donn챕. Si `--verify` est fourni, s'assurer que l'index invers챕 existant est correct. A la priorit챕 sur `pack.writeReverseIndex`."
#. type: Plain text
#: en/git-index-pack.txt:55
#, priority:100
msgid "When this flag is provided, the pack is read from stdin instead and a copy is then written to <pack-file>. If <pack-file> is not specified, the pack is written to objects/pack/ directory of the current Git repository with a default name determined from the pack content. If <pack-file> is not specified consider using --keep to prevent a race condition between this process and 'git repack'."
-msgstr ""
+msgstr "Lorsque ce drapeau est fourni, le paquet est lu 횪 partir de stdin et une copie est ensuite 챕crite dans <fichier-paquet>. Si <fichier-paquet> n'est pas sp챕cifi챕, le paquet est 챕crit dans le r챕pertoire objects/pack/ du d챕p척t Git actuel avec un nom par d챕faut d챕termin챕 횪 partir du contenu du paquet. Si <fichier-paquet> n'est pas sp챕cifi챕, il est conseill챕 d'utiliser --keep pour 챕viter une condition de course entre ce processus et 'git repack'."
#. type: Labeled list
#: en/git-index-pack.txt:56
@@ -31710,43 +31706,43 @@ msgstr "--fix-thin"
#: en/git-index-pack.txt:61
#, priority:100
msgid "Fix a \"thin\" pack produced by `git pack-objects --thin` (see linkgit:git-pack-objects[1] for details) by adding the excluded objects the deltified objects are based on to the pack. This option only makes sense in conjunction with --stdin."
-msgstr ""
+msgstr "Corriger un paquet \"mince\" produit par `git pack-objects --thin` (voir linkgit:git-pack-objects[1] pour les d챕tails) en ajoutant au paquet les objets exclus sur lesquels les objets d챕ltifi챕s sont bas챕s. Cette option n'a de sens qu'en conjonction avec --stdin."
#. type: Plain text
#: en/git-index-pack.txt:69
#, priority:100
msgid "Before moving the index into its final destination create an empty .keep file for the associated pack file. This option is usually necessary with --stdin to prevent a simultaneous 'git repack' process from deleting the newly constructed pack and index before refs can be updated to use objects contained in the pack."
-msgstr ""
+msgstr "Avant de d챕placer l'index vers sa destination finale, cr챕er un fichier .keep vide pour le fichier paquet associ챕. Cette option est g챕n챕ralement n챕cessaire avec --stdin pour 챕viter qu'un processus 'git repack' simultan챕 ne supprime le paquet et l'index nouvellement construits avant que les refs ne puissent 챗tre mis 횪 jour pour utiliser les objets contenus dans le paquet."
#. type: Labeled list
#: en/git-index-pack.txt:70
#, no-wrap, priority:100
msgid "--keep=<msg>"
-msgstr ""
+msgstr "--keep=<message>"
#. type: Plain text
#: en/git-index-pack.txt:76
#, priority:100
msgid "Like --keep create a .keep file before moving the index into its final destination, but rather than creating an empty file place '<msg>' followed by an LF into the .keep file. The '<msg>' message can later be searched for within all .keep files to locate any which have outlived their usefulness."
-msgstr ""
+msgstr "Comme --keep, cr챕er un fichier .keep avant de d챕placer l'index vers sa destination finale, mais au lieu de cr챕er un fichier vide, placer '<message>' suivi d'un LF dans le fichier .keep. Le message '<message>' peut ensuite 챗tre recherch챕 dans tous les fichiers .keep pour localiser ceux qui n'ont plus d'utilit챕."
#. type: Labeled list
#: en/git-index-pack.txt:77 en/git-pack-objects.txt:291
#, no-wrap, priority:100
msgid "--index-version=<version>[,<offset>]"
-msgstr ""
+msgstr "--index-version=<version>[,<d챕calage>]"
#. type: Plain text
#: en/git-index-pack.txt:81 en/git-pack-objects.txt:295
#, priority:100
msgid "This is intended to be used by the test suite only. It allows to force the version for the generated pack index, and to force 64-bit index entries on objects located above the given offset."
-msgstr ""
+msgstr "Ceci est destin챕 횪 챗tre utilis챕e uniquement par la suite de tests. Permet de forcer la version de l'index de paquet g챕n챕r챕, et de forcer les entr챕es d'index 64 bits sur les objets situ챕s avant le d챕calage donn챕."
#. type: Plain text
#: en/git-index-pack.txt:84
#, priority:100
msgid "Die, if the pack contains broken objects or links."
-msgstr ""
+msgstr "Mourir, si le paquet contient des objets ou des liens bris챕s."
#. type: Labeled list
#: en/git-index-pack.txt:85
@@ -31758,19 +31754,19 @@ msgstr "--progress-title"
#: en/git-index-pack.txt:87 en/git-index-pack.txt:96
#, priority:100
msgid "For internal use only."
-msgstr ""
+msgstr "A usage interne uniquement."
#. type: Plain text
#: en/git-index-pack.txt:90
#, priority:100
msgid "Set the title of the progress bar. The title is \"Receiving objects\" by default and \"Indexing objects\" when `--stdin` is specified."
-msgstr ""
+msgstr "D챕finir le titre de la barre de progression. Le titre est \"R챕ception d'objets\" par d챕faut et \"Indexation d'objets\" lorsque `--stdin` est sp챕cifi챕."
#. type: Plain text
#: en/git-index-pack.txt:93
#, priority:100
msgid "Die if the pack contains broken links. For internal use only."
-msgstr ""
+msgstr "Mourir si le paquet contient des liens bris챕s. A usage interne uniquement."
#. type: Labeled list
#: en/git-index-pack.txt:94
@@ -31782,7 +31778,7 @@ msgstr "--fsck-objects"
#: en/git-index-pack.txt:101
#, priority:100
msgid "Die if the pack contains broken objects. If the pack contains a tree pointing to a .gitmodules blob that does not exist, prints the hash of that blob (for the caller to check) after the hash that goes into the name of the pack/idx file (see \"Notes\")."
-msgstr ""
+msgstr "Mourir si le paquet contient des objets cass챕s. Si le paquet contient un arbre pointant vers un blob .gitmodules qui n'existe pas, afficher l'empreinte de ce blob (pour que l'appelant puisse le v챕rifier) apr챔s l'empreinte qui entre dans le nom du fichier pack/idx (voir \"Notes\")."
#. type: Labeled list
#: en/git-index-pack.txt:102 en/git-pack-objects.txt:281 en/git-repack.txt:120
@@ -31794,19 +31790,19 @@ msgstr "--threads=<n>"
#: en/git-index-pack.txt:111
#, priority:100
msgid "Specifies the number of threads to spawn when resolving deltas. This requires that index-pack be compiled with pthreads otherwise this option is ignored with a warning. This is meant to reduce packing time on multiprocessor machines. The required amount of memory for the delta search window is however multiplied by the number of threads. Specifying 0 will cause Git to auto-detect the number of CPU's and use maximum 3 threads."
-msgstr ""
+msgstr "Sp챕cifier le nombre de fils d'ex챕cution 횪 lancer lors de la r챕solution des deltas. Cela n챕cessite que index-pack soit compil챕 avec pthreads, sinon cette option est ignor챕e avec un avertissement. Ceci a pour but de r챕duire le temps d'empaquetage sur les machines multiprocesseurs. La quantit챕 de m챕moire requise pour la fen챗tre de recherche de delta est cependant multipli챕e par le nombre de fils. En sp챕cifiant 0, Git d챕tectera automatiquement le nombre de CPU et utilisera au maximum 3 fils."
#. type: Labeled list
#: en/git-index-pack.txt:112 en/git-unpack-objects.txt:47
#, no-wrap, priority:100
msgid "--max-input-size=<size>"
-msgstr ""
+msgstr "--max-input-size=<taille>"
#. type: Plain text
#: en/git-index-pack.txt:114 en/git-unpack-objects.txt:49
#, priority:100
msgid "Die, if the pack is larger than <size>."
-msgstr ""
+msgstr "Mourir, si le paquet est plus grand que <taille>."
#. type: Labeled list
#: en/git-index-pack.txt:115 en/git-show-index.txt:42
@@ -31836,25 +31832,25 @@ msgstr "--promisor[=<message>]"
#: en/git-index-pack.txt:132
#, priority:100
msgid "Before committing the pack-index, create a .promisor file for this pack. Particularly helpful when writing a promisor pack with --fix-thin since the name of the pack is not final until the pack has been fully written. If a `<message>` is provided, then that content will be written to the .promisor file for future reference. See link:technical/partial-clone.html[partial clone] for more information."
-msgstr ""
+msgstr "Avant de livrer le pack-index, cr챕er un fichier .promisor pour ce paquet. Particuli챔rement utile lors de l'챕criture d'un paquet promisor avec --fix-thin puisque le nom du paquet n'est pas d챕finitif tant que le paquet n'a pas 챕t챕 enti챔rement 챕crit. Si un `<message>` est fourni, son contenu sera 챕crit dans le fichier .promisor pour r챕f챕rence future. Voir link:technical/partial-clone.html [partial clone] pour plus d'informations."
#. type: Plain text
#: en/git-index-pack.txt:140
#, priority:100
msgid "Once the index has been created, the hash that goes into the name of the pack/idx file is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
-msgstr ""
+msgstr "Une fois l'index cr챕챕, le nom du fichier pack/idx est affich챕 sur stdout. Si --stdin a 챕galement 챕t챕 utilis챕, le nom est pr챕fix챕 par \"pack\\t\" ou \"keep\\t\" si un nouveau fichier .keep a 챕t챕 cr챕챕 avec succ챔s. Ceci est utile pour supprimer un fichier"
#. type: Block title
#: en/git-index-pack.txt:140
#, no-wrap, priority:100
msgid "keep file used as a lock to prevent the race with 'git repack'"
-msgstr ""
+msgstr "le fichier .keep utilis챕 comme verrou pour 챕viter la course avec 'git repack'"
#. type: Plain text
#: en/git-index-pack.txt:142
#, priority:100
msgid "mentioned above."
-msgstr ""
+msgstr "mentionn챕e ci-dessus."
#. type: Title =
#: en/git-init-db.txt:2
@@ -32185,19 +32181,19 @@ msgid ""
"'git instaweb' [--local] [--httpd=<httpd>] [--port=<port>]\n"
" [--browser=<browser>]\n"
"'git instaweb' [--start] [--stop] [--restart]\n"
-msgstr ""
+msgstr "'git instaweb' [--local] [--httpd=<httpd>] [--port=<port>]\n [--browser=<navigateur>]\n'git instaweb' [--start] [--stop] [--restart]\n"
#. type: Plain text
#: en/git-instaweb.txt:19
#, priority:100
msgid "A simple script to set up `gitweb` and a web server for browsing the local repository."
-msgstr ""
+msgstr "Un script simple pour configurer `gitweb` et un serveur web pour parcourir le d챕p척t local."
#. type: Plain text
#: en/git-instaweb.txt:26
#, priority:100
msgid "Only bind the web server to the local IP (127.0.0.1)."
-msgstr ""
+msgstr "Ne lier le serveur web qu'횪 l'IP locale (127.0.0.1)."
#. type: Labeled list
#: en/git-instaweb.txt:28
@@ -32209,7 +32205,7 @@ msgstr "--httpd"
#: en/git-instaweb.txt:35
#, priority:100
msgid "The HTTP daemon command-line that will be executed. Command-line options may be specified here, and the configuration file will be added at the end of the command-line. Currently apache2, lighttpd, mongoose, plackup, python and webrick are supported. (Default: lighttpd)"
-msgstr ""
+msgstr "La ligne de commande du daemon HTTP qui sera ex챕cut챕e. Les options de ligne de commande peuvent 챗tre sp챕cifi챕es ici, et le fichier de configuration sera ajout챕 횪 la fin de la ligne de commande. Actuellement apache2, lighttpd, mongoose, plackup, python et webrick sont pris en charge. (D챕faut��: lighttpd)"
#. type: Labeled list
#: en/git-instaweb.txt:37
@@ -32221,7 +32217,7 @@ msgstr "--module-path"
#: en/git-instaweb.txt:40
#, priority:100
msgid "The module path (only needed if httpd is Apache). (Default: /usr/lib/apache2/modules)"
-msgstr ""
+msgstr "Le chemin du module (uniquement n챕cessaire si httpd est Apache). (Par d챕fault��: /usr/lib/apache2/modules)"
#. type: Labeled list
#: en/git-instaweb.txt:42
@@ -32233,7 +32229,7 @@ msgstr "--port"
#: en/git-instaweb.txt:44
#, priority:100
msgid "The port number to bind the httpd to. (Default: 1234)"
-msgstr ""
+msgstr "Le num챕ro de port pour lier le httpd. (Par d챕faut혻: 1234)"
#. type: Labeled list
#: en/git-instaweb.txt:46
@@ -32245,13 +32241,13 @@ msgstr "--browser"
#: en/git-instaweb.txt:52
#, priority:100
msgid "The web browser that should be used to view the gitweb page. This will be passed to the 'git web{litdd}browse' helper script along with the URL of the gitweb instance. See linkgit:git-web{litdd}browse[1] for more information about this. If the script fails, the URL will be printed to stdout."
-msgstr ""
+msgstr "Le navigateur web qui devrait 챗tre utilis챕 pour afficher la page gitweb. Ceci sera transmis au script auxiliaire 'git web{litdd}browse' avec l'URL de l'instance de gitweb. Voir linkgit:git-web{litdd}browse[1] pour plus d'informations 횪 ce sujet. Si le script 챕choue, l'URL sera imprim챕e sur stdout."
#. type: Labeled list
#: en/git-instaweb.txt:53 en/git-update-ref.txt:125
#, no-wrap, priority:100
msgid "start"
-msgstr ""
+msgstr "start"
#. type: Labeled list
#: en/git-instaweb.txt:54
@@ -32263,7 +32259,7 @@ msgstr "--start"
#: en/git-instaweb.txt:57
#, priority:100
msgid "Start the httpd instance and exit. Regenerate configuration files as necessary for spawning a new instance."
-msgstr ""
+msgstr "D챕marrer l'instance httpd et sortir. R챕g챕n챕rer les fichiers de configuration n챕cessaires pour cr챕er une nouvelle instance."
#. type: Labeled list
#: en/git-instaweb.txt:58
@@ -32281,7 +32277,7 @@ msgstr "--stop"
#: en/git-instaweb.txt:63
#, priority:100
msgid "Stop the httpd instance and exit. This does not generate any of the configuration files for spawning a new instance, nor does it close the browser."
-msgstr ""
+msgstr "Arr챗ter l'instance httpd et sortir. Cela ne g챕n챔re aucun des fichiers de configuration pour cr챕er une nouvelle instance, ni ne ferme le navigateur."
#. type: Labeled list
#: en/git-instaweb.txt:64
@@ -32299,13 +32295,13 @@ msgstr "--restart"
#: en/git-instaweb.txt:68
#, priority:100
msgid "Restart the httpd instance and exit. Regenerate configuration files as necessary for spawning a new instance."
-msgstr ""
+msgstr "R챕d챕marrer l'instance httpd et sortir. R챕g챕n챕rer les fichiers de configuration n챕cessaires pour cr챕er une nouvelle instance."
#. type: Plain text
#: en/git-instaweb.txt:73
#, priority:100
msgid "You may specify configuration in your .git/config"
-msgstr ""
+msgstr "Vous pouvez sp챕cifier la configuration dans votre fichier .git/config"
#. type: delimited block -
#: en/git-instaweb.txt:81
@@ -32317,13 +32313,13 @@ msgid ""
"\tport = 4321\n"
"\tbrowser = konqueror\n"
"\tmodulePath = /usr/lib/apache2/modules\n"
-msgstr ""
+msgstr "[instaweb]\n\tlocal = true\n\thttpd = apache2 -f\n\tport = 4321\n\tbrowser = konqueror\n\tmodulePath = /usr/lib/apache2/modules\n"
#. type: Plain text
#: en/git-instaweb.txt:87
#, priority:100
msgid "If the configuration variable `instaweb.browser` is not set, `web.browser` will be used instead if it is defined. See linkgit:git-web{litdd}browse[1] for more information about this."
-msgstr ""
+msgstr "Si la variable de configuration `instaweb.browser` n'est pas d챕finie, `web.browser` sera utilis챕 횪 la place si elle est d챕finie. Voir linkgit:git-web{litdd}browse[1] pour plus d'information 횪 ce sujet."
#. type: Title =
#: en/git-interpret-trailers.txt:2
@@ -32344,73 +32340,73 @@ msgid ""
"'git interpret-trailers' [--in-place] [--trim-empty]\n"
"\t\t\t[(--trailer <token>[(=|:)<value>])...]\n"
"\t\t\t[--parse] [<file>...]\n"
-msgstr ""
+msgstr "'git interpret-trailers' [--in-place] [--trim-empty]\n\t\t\t[(--trailer <jeton>[(=|:)<valeur>])...]\n\t\t\t[--parse] [<fichier>...]\n"
#. type: Plain text
#: en/git-interpret-trailers.txt:20
#, priority:100
msgid "Help parsing or adding 'trailers' lines, that look similar to RFC 822 e-mail headers, at the end of the otherwise free-form part of a commit message."
-msgstr ""
+msgstr "Aide 횪 analyser ou 횪 ajouter des lignes terminales, qui ressemblent 횪 des en-t챗tes de courriel RFC 822, 횪 la fin de la partie autrement libre d'un message de validation."
#. type: Plain text
#: en/git-interpret-trailers.txt:24
#, priority:100
msgid "This command reads some patches or commit messages from either the <file> arguments or the standard input if no <file> is specified. If `--parse` is specified, the output consists of the parsed trailers."
-msgstr ""
+msgstr "Cette commande lit des rustines ou des messages de validation provenant soit des <fichier>s en argument, soit de l'entr챕e standard, si aucun <fichier> n'est sp챕cifi챕. Si `--parse` est sp챕cifi챕, la sortie se compose des lignes terminales analys챕es."
#. type: Plain text
#: en/git-interpret-trailers.txt:28
#, priority:100
msgid "Otherwise, this command applies the arguments passed using the `--trailer` option, if any, to the commit message part of each input file. The result is emitted on the standard output."
-msgstr ""
+msgstr "Sinon, cette commande applique les arguments pass챕s en utilisant l'option `---trailer`, le cas 챕ch챕ant, 횪 la partie de message de validation de chaque fichier d'entr챕e. Le r챕sultat est 챕mis sur la sortie standard."
#. type: Plain text
#: en/git-interpret-trailers.txt:33
#, priority:100
msgid "Some configuration variables control the way the `--trailer` arguments are applied to each commit message and the way any existing trailer in the commit message is changed. They also make it possible to automatically add some trailers."
-msgstr ""
+msgstr "Certaines variables de configuration contr척lent la fa챌on dont les arguments `--trailer` sont appliqu챕s 횪 chaque message de validation et la fa챌on dont toute ligne terminale existante dans le message de validation est chang챕e. Elles permettent 챕galement d'ajouter automatiquement des lignes terminales."
#. type: Plain text
#: en/git-interpret-trailers.txt:40
#, priority:100
msgid "By default, a '<token>=<value>' or '<token>:<value>' argument given using `--trailer` will be appended after the existing trailers only if the last trailer has a different (<token>, <value>) pair (or if there is no existing trailer). The <token> and <value> parts will be trimmed to remove starting and trailing whitespace, and the resulting trimmed <token> and <value> will appear in the message like this:"
-msgstr ""
+msgstr "Par d챕faut, l'argument '<jeton>=<valeur>' or '<jeton>:<valeur>' fourni en utilisant `--trailer` ne sera ajout챕 apr챔s les lignes terminales existantes que si la derni챔re ligne terminale a une paire (<jeton>, <valeur>) diff챕rente (ou s'il n'y a pas de ligne terminale). Les parties <jeton> et <valeur> seront d챕coup챕es pour supprimer l'espace blanc de d챕part et de fin, et les <jeton> et <valeur> nettoy챕s r챕sultants seront appos챕s dans le message comme ceci혻:"
#. type: delimited block -
#: en/git-interpret-trailers.txt:43
#, no-wrap, priority:100
msgid "token: value\n"
-msgstr ""
+msgstr "jeton:valeur\n"
#. type: Plain text
#: en/git-interpret-trailers.txt:47
#, priority:100
msgid "This means that the trimmed <token> and <value> will be separated by `': '` (one colon followed by one space)."
-msgstr ""
+msgstr "Cela signifie que les <jeton> et <valeur> nettoy챕s seront s챕par챕s par `': '` (deux points suivis d'un espace)."
#. type: Plain text
#: en/git-interpret-trailers.txt:53
#, priority:100
msgid "By default the new trailer will appear at the end of all the existing trailers. If there is no existing trailer, the new trailer will appear after the commit message part of the output, and, if there is no line with only spaces at the end of the commit message part, one blank line will be added before the new trailer."
-msgstr ""
+msgstr "Par d챕faut, la nouvelle ligne terminale appara챤tra apr챔s toutes les lignes terminales existantes. S'il n'y a pas de ligne terminale existante, la nouvelle ligne terminale appara챤tra apr챔s la partie message de validation de la sortie et, s'il n'y a pas de ligne avec seulement des espaces 횪 la fin de la partie de message de validation, une ligne vierge sera ajout챕e avant la nouvelle ligne terminale."
#. type: Plain text
#: en/git-interpret-trailers.txt:63
#, priority:100
msgid "Existing trailers are extracted from the input message by looking for a group of one or more lines that (i) is all trailers, or (ii) contains at least one Git-generated or user-configured trailer and consists of at least 25% trailers. The group must be preceded by one or more empty (or whitespace-only) lines. The group must either be at the end of the message or be the last non-whitespace lines before a line that starts with '---' (followed by a space or the end of the line). Such three minus signs start the patch part of the message. See also `--no-divider` below."
-msgstr ""
+msgstr "Les lignes terminales existantes sont extraites du message en entr챕e en recherchant un groupe d'une ou plusieurs lignes qui (i) n'est constitu챕 que de lignes terminales, ou (ii) contient au moins une ligne terminale g챕n챕r챕e par Git ou pour par la configuration utilisateur et se compose d'au moins 25% de lignes terminales. Le groupe doit 챗tre pr챕c챕d챕 d'une ou de plusieurs lignes vides (ou espace seulement). Le groupe doit soit 챗tre 횪 la fin du message, soit 챗tre les derni챔res lignes non blanches avant une ligne qui commence par '---' (suivi par un espace ou la fin de la ligne). Ces trois signes moins commencent la partie rustine du message. Voir aussi `--no-divider` ci-dessous."
#. type: Plain text
#: en/git-interpret-trailers.txt:70
#, priority:100
msgid "When reading trailers, there can be no whitespace before or inside the token, but any number of regular space and tab characters are allowed between the token and the separator. There can be whitespaces before, inside or after the value. The value may be split over multiple lines with each subsequent line starting with at least one whitespace, like the \"folding\" in RFC 822."
-msgstr ""
+msgstr "Lors de la lecture des lignes terminales, il ne doit pas y avoir d'espace blanc avant ou 횪 l'int챕rieur du jeton, mais les caract챔res d'espace normaux ou de tabulations sont autoris챕s entre le jeton et le s챕parateur. Il peut y avoir des espaces blancs avant, 횪 l'int챕rieur ou apr챔s la valeur. La valeur peut 챗tre divis챕e sur plusieurs lignes avec chaque ligne subs챕quente commen챌ant par au moins un espace blanc, comme le \"folding\" dans RFC 822."
#. type: Plain text
#: en/git-interpret-trailers.txt:74
#, priority:100
msgid "Note that 'trailers' do not follow and are not intended to follow many rules for RFC 822 headers. For example they do not follow the encoding rules and probably many other rules."
-msgstr ""
+msgstr "Notez que les lignes terminales ne suivent pas et ne sont pas destin챕es 횪 suivre de nombreuses r챔gles pour les en-t챗tes RFC 822. Par exemple, elles ne suivent pas les r챔gles d'encodage et probablement beaucoup d'autres r챔gles."
#. type: Labeled list
#: en/git-interpret-trailers.txt:77
@@ -32434,13 +32430,13 @@ msgstr "--trim-empty"
#: en/git-interpret-trailers.txt:84
#, priority:100
msgid "If the <value> part of any trailer contains only whitespace, the whole trailer will be removed from the resulting message. This applies to existing trailers as well as new trailers."
-msgstr ""
+msgstr "Si la partie <valeur> d'une ligne terminale ne contient que des espaces blancs, la totalit챕 de la ligne terminale est 챕limin챕e du message r챕sultant. Ceci s'applique aux lignes terminales pr챕-existantes ainsi qu'aux nouvelles lignes terminales."
#. type: Plain text
#: en/git-interpret-trailers.txt:89
#, priority:100
msgid "Specify a (<token>, <value>) pair that should be applied as a trailer to the input messages. See the description of this command."
-msgstr ""
+msgstr "Sp챕cifier une paire (<jeton>, <valeur> ) qui devrait 챗tre appliqu챕e comme ligne terminale aux messages en entr챕e. Voir la description de cette commande."
#. type: Labeled list
#: en/git-interpret-trailers.txt:90
@@ -32458,7 +32454,7 @@ msgstr "--no-where"
#: en/git-interpret-trailers.txt:97
#, priority:100
msgid "Specify where all new trailers will be added. A setting provided with '--where' overrides all configuration variables and applies to all '--trailer' options until the next occurrence of '--where' or '--no-where'. Possible values are `after`, `before`, `end` or `start`."
-msgstr ""
+msgstr "Pr챕ciser o첫 toutes les nouvelles lignes terminales seront ajout챕es. Un param챔tre fourni avec '--where' a pr챕c챕dence sur toutes les variables de configuration et s'applique 횪 toutes les options '--trailer' jusqu'횪 la prochaine occurrence de '--where' ou '--no-where'. Les valeurs possibles sont `after`, `before`, `end` ou `start`."
#. type: Labeled list
#: en/git-interpret-trailers.txt:98
@@ -32476,7 +32472,7 @@ msgstr "--no-if-exists"
#: en/git-interpret-trailers.txt:106
#, priority:100
msgid "Specify what action will be performed when there is already at least one trailer with the same <token> in the message. A setting provided with '--if-exists' overrides all configuration variables and applies to all '--trailer' options until the next occurrence of '--if-exists' or '--no-if-exists'. Possible actions are `addIfDifferent`, `addIfDifferentNeighbor`, `add`, `replace` and `doNothing`."
-msgstr ""
+msgstr "Sp챕cifier l'action qui sera ex챕cut챕e lorsqu'il y a d챕j횪 au moins une ligne terminale avec le m챗me <jeton> dans le message. Un param챔tre fourni avec \"--if-exists\" surcharge toutes les variables de configuration et s'applique 횪 toutes les options '---trailer' jusqu'횪 la prochaine occurrence de '--if-exists' ou '-no-if-exists'. Les actions possibles sont `addIfDifferent`, `addIfDifferentNeighbor`, `add`, `replace` et `doNothing`."
#. type: Labeled list
#: en/git-interpret-trailers.txt:107
@@ -32494,7 +32490,7 @@ msgstr "--no-if-missing"
#: en/git-interpret-trailers.txt:115
#, priority:100
msgid "Specify what action will be performed when there is no other trailer with the same <token> in the message. A setting provided with '--if-missing' overrides all configuration variables and applies to all '--trailer' options until the next occurrence of '--if-missing' or '--no-if-missing'. Possible actions are `doNothing` or `add`."
-msgstr ""
+msgstr "Sp챕cifier l'action qui sera ex챕cut챕e lorsqu'il n'y a pas d'autre ligne-terminale avec le m챗me <jeton> dans le message. Un param챔tre fourni avec \"-if-missing\" remplace toutes les variables de configuration et s'applique 횪 toutes les options '--trailer' jusqu'횪 la prochaine occurrence de '--if-missing' ou '-no-if-missing'. Les actions possibles sont `doNothing` ou `add`."
#. type: Labeled list
#: en/git-interpret-trailers.txt:116
@@ -32506,7 +32502,7 @@ msgstr "--only-trailers"
#: en/git-interpret-trailers.txt:118
#, priority:100
msgid "Output only the trailers, not any other parts of the input."
-msgstr ""
+msgstr "Extraire seulement les lignes terminales, pas d'autres parties de l'entr챕e."
#. type: Labeled list
#: en/git-interpret-trailers.txt:119
@@ -32518,7 +32514,7 @@ msgstr "--only-input"
#: en/git-interpret-trailers.txt:123
#, priority:100
msgid "Output only trailers that exist in the input; do not add any from the command-line or by following configured `trailer.*` rules."
-msgstr ""
+msgstr "Ne sortir que les lignes terminales qui existent dans l'entr챕e��; n'ajouter aucune depuis la ligne de commande ou en suivant les r챔gles`trailer.*` configur챕es."
#. type: Labeled list
#: en/git-interpret-trailers.txt:124
@@ -32530,7 +32526,7 @@ msgstr "--unfold"
#: en/git-interpret-trailers.txt:127
#, priority:100
msgid "Remove any whitespace-continuation in trailers, so that each trailer appears on a line by itself with its full content."
-msgstr ""
+msgstr "Retirer toute continuation par espace blanc dans les lignes terminales, de sorte que chaque ligne terminale appara챤t sur une ligne en elle-m챗me avec son contenu complet."
#. type: Labeled list
#: en/git-interpret-trailers.txt:128
@@ -32542,7 +32538,7 @@ msgstr "--parse"
#: en/git-interpret-trailers.txt:131
#, priority:100
msgid "A convenience alias for `--only-trailers --only-input --unfold`."
-msgstr ""
+msgstr "Un alias de commodit챕 pour `--only-trailers --only-input --unfold`."
#. type: Labeled list
#: en/git-interpret-trailers.txt:132
@@ -32554,259 +32550,259 @@ msgstr "--no-divider"
#: en/git-interpret-trailers.txt:136
#, priority:100
msgid "Do not treat `---` as the end of the commit message. Use this when you know your input contains just the commit message itself (and not an email or the output of `git format-patch`)."
-msgstr ""
+msgstr "Ne pas traiter `---` comme la fin du message de validation. Utilisez ceci lorsque vous savez que votre entr챕e contient simplement le message de validation lui-m챗me (et non un courriel ou la sortie de `git format-patch`)."
#. type: Labeled list
#: en/git-interpret-trailers.txt:140
#, no-wrap, priority:100
msgid "trailer.separators"
-msgstr ""
+msgstr "trailer.separators"
#. type: Plain text
#: en/git-interpret-trailers.txt:145
#, priority:100
msgid "This option tells which characters are recognized as trailer separators. By default only ':' is recognized as a trailer separator, except that '=' is always accepted on the command line for compatibility with other git commands."
-msgstr ""
+msgstr "Cette option indique quels caract챔res sont reconnus comme s챕parateurs de ligne terminale. Par d챕faut seul ':' est reconnu comme un s챕parateur de ligne terminale, 횪 part '=' qui est toujours accept챕 sur la ligne de commande pour compatibilit챕 avec les autres commandes git."
#. type: Plain text
#: en/git-interpret-trailers.txt:149
#, priority:100
msgid "The first character given by this option will be the default character used when another separator is not specified in the config for this trailer."
-msgstr ""
+msgstr "Le premier caract챔re donn챕 par cette option sera le caract챔re par d챕faut utilis챕 lorsqu'un autre s챕parateur n'est pas sp챕cifi챕 dans la configuration de cette ligne terminale."
#. type: Plain text
#: en/git-interpret-trailers.txt:156
#, priority:100
msgid "For example, if the value for this option is \"%=$\", then only lines using the format '<token><sep><value>' with <sep> containing '%', '=' or '$' and then spaces will be considered trailers. And '%' will be the default separator used, so by default trailers will appear like: '<token>% <value>' (one percent sign and one space will appear between the token and the value)."
-msgstr ""
+msgstr "Par exemple, si la valeur de cette option est \"%=$\", alors seulement les lignes utilisant le format '<jeton><sep><valeur>' contenant '%', '=' ou '$' suivis d'espaces seront consid챕r챕es comme des lignes terminales. Et '%' sera le s챕parateur par d챕faut utilis챕, donc par les lignes terminales par d챕faut ressembleront 횪혻: '<jeton>% <valeur>' (un signe pourcent et un espace appara챤tront entre le jeton et la valeur)."
#. type: Labeled list
#: en/git-interpret-trailers.txt:157
#, no-wrap, priority:100
msgid "trailer.where"
-msgstr ""
+msgstr "trailer.where"
#. type: Plain text
#: en/git-interpret-trailers.txt:159
#, priority:100
msgid "This option tells where a new trailer will be added."
-msgstr ""
+msgstr "Cette option indique o첫 une nouvelle ligne terminale sera ajout챕e."
#. type: Plain text
#: en/git-interpret-trailers.txt:161
#, priority:100
msgid "This can be `end`, which is the default, `start`, `after` or `before`."
-msgstr ""
+msgstr "Les choix sont `end`(fin), par d챕faut, ou `start`(d챕but), `after`(apr챔s) ou `before` (avant)."
#. type: Plain text
#: en/git-interpret-trailers.txt:164
#, priority:100
msgid "If it is `end`, then each new trailer will appear at the end of the existing trailers."
-msgstr ""
+msgstr "S'il s'agit de `end` , chaque nouvelle ligne terminale appara챤tra 횪 la fin des lignes terminales existantes."
#. type: Plain text
#: en/git-interpret-trailers.txt:167
#, priority:100
msgid "If it is `start`, then each new trailer will appear at the start, instead of the end, of the existing trailers."
-msgstr ""
+msgstr "S'il s'agit de `start` , chaque nouvelle ligne terminale appara챤tra au d챕but, au lieu de la fin, des lignes terminales."
#. type: Plain text
#: en/git-interpret-trailers.txt:170
#, priority:100
msgid "If it is `after`, then each new trailer will appear just after the last trailer with the same <token>."
-msgstr ""
+msgstr "Si c'est `after`, chaque nouvelle ligne terminale appara챤tra juste apr챔s la derni챔re ligne terminale avec le m챗me <jeton>."
#. type: Plain text
#: en/git-interpret-trailers.txt:173
#, priority:100
msgid "If it is `before`, then each new trailer will appear just before the first trailer with the same <token>."
-msgstr ""
+msgstr "Si c'est `before`, chaque nouvelle ligne terminale appara챤tra juste avant la premi챔re ligne terminale avec le m챗me <jeton>."
#. type: Labeled list
#: en/git-interpret-trailers.txt:174
#, no-wrap, priority:100
msgid "trailer.ifexists"
-msgstr ""
+msgstr "trailer.ifexists"
#. type: Plain text
#: en/git-interpret-trailers.txt:178
#, priority:100
msgid "This option makes it possible to choose what action will be performed when there is already at least one trailer with the same <token> in the message."
-msgstr ""
+msgstr "Cette option permet de choisir l'action qui sera ex챕cut챕e lorsqu'il y a d챕j횪 au moins une ligne terminale avec le m챗me <jeton> dans le message."
#. type: Plain text
#: en/git-interpret-trailers.txt:181
#, priority:100
msgid "The valid values for this option are: `addIfDifferentNeighbor` (this is the default), `addIfDifferent`, `add`, `replace` or `doNothing`."
-msgstr ""
+msgstr "Les valeurs valables pour cette option sont��: `addIfDifferentNeighbor` (par d챕faut), `addIfDifferent`, `add`, `replace` ou `doNothing`."
#. type: Plain text
#: en/git-interpret-trailers.txt:185
#, priority:100
msgid "With `addIfDifferentNeighbor`, a new trailer will be added only if no trailer with the same (<token>, <value>) pair is above or below the line where the new trailer will be added."
-msgstr ""
+msgstr "Avec `addIfDifferentNeighbor`, une nouvelle ligne terminale ne sera ajout챕e que si aucune ligne terminale avec la m챗me paire (<jeton>, <valeur>) n'est au-dessus ou en dessous de la ligne o첫 la nouvelle ligne terminale sera ajout챕e."
#. type: Plain text
#: en/git-interpret-trailers.txt:188
#, priority:100
msgid "With `addIfDifferent`, a new trailer will be added only if no trailer with the same (<token>, <value>) pair is already in the message."
-msgstr ""
+msgstr "Avec `addIfDifferent`, une nouvelle ligne terminale ne sera ajout챕e que si aucune ligne terminale avec la m챗me paire (<jeton>, <valeur>) n'est d챕j횪 dans le message."
#. type: Plain text
#: en/git-interpret-trailers.txt:191
#, priority:100
msgid "With `add`, a new trailer will be added, even if some trailers with the same (<token>, <value>) pair are already in the message."
-msgstr ""
+msgstr "Avec `add`, une nouvelle ligne terminale sera ajout챕e, m챗me si certaines lignes terminales avec la m챗me paire (<jeton>, <valeur>) sont d챕j횪 pr챕sentes dans le message."
#. type: Plain text
#: en/git-interpret-trailers.txt:196
#, priority:100
msgid "With `replace`, an existing trailer with the same <token> will be deleted and the new trailer will be added. The deleted trailer will be the closest one (with the same <token>) to the place where the new one will be added."
-msgstr ""
+msgstr "Avec `replace`, une ligne terminale existante avec le m챗me <jeton> sera supprim챕e et la nouvelle ligne terminale sera ajout챕e. La ligne terminale supprim챕e sera la plus proche (avec le m챗me <jeton>) de l'endroit o첫 la nouvelle sera ajout챕e."
#. type: Plain text
#: en/git-interpret-trailers.txt:199
#, priority:100
msgid "With `doNothing`, nothing will be done; that is no new trailer will be added if there is already one with the same <token> in the message."
-msgstr ""
+msgstr "Avec `doNothing`, rien ne sera fait��; c'est-횪-dire qu'aucune nouvelle ligne terminale ne sera ajout챕e s'il y en a d챕j횪 une avec le m챗me <jeton> dans le message."
#. type: Labeled list
#: en/git-interpret-trailers.txt:200
#, no-wrap, priority:100
msgid "trailer.ifmissing"
-msgstr ""
+msgstr "trailer.ifmissing"
#. type: Plain text
#: en/git-interpret-trailers.txt:204
#, priority:100
msgid "This option makes it possible to choose what action will be performed when there is not yet any trailer with the same <token> in the message."
-msgstr ""
+msgstr "Cette option permet de choisir l'action qui sera ex챕cut챕e lorsqu'il n'y a pas encore de ligne terminale avec le m챗me <jeton> dans le message."
#. type: Plain text
#: en/git-interpret-trailers.txt:207
#, priority:100
msgid "The valid values for this option are: `add` (this is the default) and `doNothing`."
-msgstr ""
+msgstr "Les valeurs valides pour cette option sont혻: `add` (par d챕faut) et `doNothing`."
#. type: Plain text
#: en/git-interpret-trailers.txt:209
#, priority:100
msgid "With `add`, a new trailer will be added."
-msgstr ""
+msgstr "Avec `add`, une nouvelle ligne terminale sera ajout챕e."
#. type: Plain text
#: en/git-interpret-trailers.txt:211
#, priority:100
msgid "With `doNothing`, nothing will be done."
-msgstr ""
+msgstr "Avec `doNothing`, rien ne sera fait."
#. type: Labeled list
#: en/git-interpret-trailers.txt:212
#, no-wrap, priority:100
msgid "trailer.<token>.key"
-msgstr ""
+msgstr "trailer.<jeton>.key"
#. type: Plain text
#: en/git-interpret-trailers.txt:218
#, priority:100
msgid "This `key` will be used instead of <token> in the trailer. At the end of this key, a separator can appear and then some space characters. By default the only valid separator is ':', but this can be changed using the `trailer.separators` config variable."
-msgstr ""
+msgstr "Cette `cl챕` sera utilis챕e au lieu de <jeton> dans la ligne terminale. A la fin de cette cl챕, un s챕parateur peut appara챤tre et puis quelques caract챔res d'espace. Par d챕faut, le seul s챕parateur valide est ':', mais cela peut 챗tre chang챕 en utilisant la variable de configuration `trailer. separators`."
#. type: Plain text
#: en/git-interpret-trailers.txt:221
#, priority:100
msgid "If there is a separator, then the key will be used instead of both the <token> and the default separator when adding the trailer."
-msgstr ""
+msgstr "S'il y a un s챕parateur, la cl챕 sera utilis챕e 횪 la place du couple <jeton> et s챕parateur par d챕faut lors de l'ajout de la ligne terminale."
#. type: Labeled list
#: en/git-interpret-trailers.txt:222
#, no-wrap, priority:100
msgid "trailer.<token>.where"
-msgstr ""
+msgstr "trailer.<jeton>.where"
#. type: Plain text
#: en/git-interpret-trailers.txt:226
#, priority:100
msgid "This option takes the same values as the 'trailer.where' configuration variable and it overrides what is specified by that option for trailers with the specified <token>."
-msgstr ""
+msgstr "Cette option prend les m챗mes valeurs que la variable de configuration 'trailer.where' et elle annule ce qui est sp챕cifi챕 par cette option pour les lignes terminales avec le <jeton> sp챕cifi챕."
#. type: Labeled list
#: en/git-interpret-trailers.txt:227
#, no-wrap, priority:100
msgid "trailer.<token>.ifexists"
-msgstr ""
+msgstr "trailer.<jeton>.ifexists"
#. type: Plain text
#: en/git-interpret-trailers.txt:231
#, priority:100
msgid "This option takes the same values as the 'trailer.ifexists' configuration variable and it overrides what is specified by that option for trailers with the specified <token>."
-msgstr ""
+msgstr "Cette option prend les m챗mes valeurs que la variable de configuration 'trailer.ifexists' et elle annule ce qui est sp챕cifi챕 par cette option pour les lignes terminales avec le <jeton> sp챕cifi챕."
#. type: Labeled list
#: en/git-interpret-trailers.txt:232
#, no-wrap, priority:100
msgid "trailer.<token>.ifmissing"
-msgstr ""
+msgstr "trailer.<jeton>.ifmissing"
#. type: Plain text
#: en/git-interpret-trailers.txt:236
#, priority:100
msgid "This option takes the same values as the 'trailer.ifmissing' configuration variable and it overrides what is specified by that option for trailers with the specified <token>."
-msgstr ""
+msgstr "Cette option prend les m챗mes valeurs que la variable de configuration 'trailer.ifmissing' et elle annule ce qui est sp챕cifi챕 par cette option pour les lignes terminales avec le <jeton> sp챕cifi챕."
#. type: Labeled list
#: en/git-interpret-trailers.txt:237
#, no-wrap, priority:100
msgid "trailer.<token>.command"
-msgstr ""
+msgstr "trailer.<jeton>.command"
#. type: Plain text
#: en/git-interpret-trailers.txt:242
#, priority:100
msgid "This option behaves in the same way as 'trailer.<token>.cmd', except that it doesn't pass anything as argument to the specified command. Instead the first occurrence of substring $ARG is replaced by the value that would be passed as argument."
-msgstr ""
+msgstr "Cette option se comporte de la m챗me mani챔re que 'trailer.<jeton>.cmd', sauf qu'elle ne passe rien comme argument 횪 la commande sp챕cifi챕e. Au lieu de cela, la premi챔re occurrence de sous-cha챤ne $ARG est remplac챕e par la valeur qui serait transmise comme argument."
#. type: Plain text
#: en/git-interpret-trailers.txt:246
#, priority:100
msgid "The 'trailer.<token>.command' option has been deprecated in favor of 'trailer.<token>.cmd' due to the fact that $ARG in the user's command is only replaced once and that the original way of replacing $ARG is not safe."
-msgstr ""
+msgstr "L'option 'trailer. <jeton>.command' a 챕t챕 rendue obsol챔te en faveur de 'trailer.<jeton>.cmd'. Ceci est d청 au fait que $ARG dans la commande de l'utilisateur n'est remplac챕 qu'une fois et que la fa챌on originale de remplacer $ARG n'est pas s청re."
#. type: Plain text
#: en/git-interpret-trailers.txt:250
#, priority:100
msgid "When both 'trailer.<token>.cmd' and 'trailer.<token>.command' are given for the same <token>, 'trailer.<token>.cmd' is used and 'trailer.<token>.command' is ignored."
-msgstr ""
+msgstr "Quand 횪 la fois 'trailer.<jeton>.cmd' et 'trailer.<jeton>.command' sont donn챕s pour le m챗me <jeton>, 'trailer.<jeton>.cmd' est utilis챕e et 'trailer.<jeton>.command' est ignor챕e."
#. type: Labeled list
#: en/git-interpret-trailers.txt:251
#, no-wrap, priority:100
msgid "trailer.<token>.cmd"
-msgstr ""
+msgstr "trailer.<jeton>.cmd"
#. type: Plain text
#: en/git-interpret-trailers.txt:256
#, priority:100
msgid "This option can be used to specify a shell command that will be called: once to automatically add a trailer with the specified <token>, and then each time a '--trailer <token>=<value>' argument to modify the <value> of the trailer that this option would produce."
-msgstr ""
+msgstr "Cette option peut 챗tre utilis챕e pour sp챕cifier une commande shell qui sera appel챕e혻: une fois pour ajouter automatiquement une ligne terminale avec le <jeton> sp챕cifi챕, puis pour chaque fois qu'un argument '--trailer <jeton>=<valeur>' pour modifier la valeur de la ligne terminale que cette option produirait."
#. type: Plain text
#: en/git-interpret-trailers.txt:263
#, priority:100
msgid "When the specified command is first called to add a trailer with the specified <token>, the behavior is as if a special '--trailer <token>=<value>' argument was added at the beginning of the \"git interpret-trailers\" command, where <value> is taken to be the standard output of the command with any leading and trailing whitespace trimmed off."
-msgstr ""
+msgstr "Lorsque la commande sp챕cifi챕e est d'abord appel챕e pour ajouter une ligne terminale avec la commande sp챕cifi챕e, le comportement est comme si un argument sp챕cial '--trailer <jeton>=<valeur>' avait 챕t챕 ajout챕 au d챕but de la commande \"git interpret-trailers\", o첫 la <valeur> obtenue sera la sortie standard de la commande nettoy챕e des espaces blancs de d챕but et de fin."
#. type: Plain text
#: en/git-interpret-trailers.txt:270
#, priority:100
msgid "If some '--trailer <token>=<value>' arguments are also passed on the command line, the command is called again once for each of these arguments with the same <token>. And the <value> part of these arguments, if any, will be passed to the command as its first argument. This way the command can produce a <value> computed from the <value> passed in the '--trailer <token>=<value>' argument."
-msgstr ""
+msgstr "Si certains arguments '---trailer <jeton>=<valeur>' sont 챕galement pass챕s sur la ligne de commande, la commande est de nouveau appel챕e pour chacun de ces arguments avec le m챗me <jeton>. Et la partie <valeur> de ces arguments, le cas 챕ch챕ant, sera transmise 횪 la commande comme son premier argument. De cette fa챌on, la commande peut produire une <valeur> calcul챕e 횪 partir de l'argument '--trailer <jeton>=<valeur>'."
#. type: Plain text
#: en/git-interpret-trailers.txt:276
#, priority:100
msgid "Configure a 'sign' trailer with a 'Signed-off-by' key, and then add two of these trailers to a message:"
-msgstr ""
+msgstr "Configurer une ligne terminale 'signature' avec une cl챕 'Signed-off-by', puis ajouter deux de ces lignes terminales 횪 un message혻:"
#. type: delimited block -
#: en/git-interpret-trailers.txt:281
@@ -32815,7 +32811,7 @@ msgid ""
"$ git config trailer.sign.key \"Signed-off-by\"\n"
"$ cat msg.txt\n"
"subject\n"
-msgstr ""
+msgstr "$ git config trailer.sign.key \"Signed-off-by\"\n$ cat msg.txt\nsubject\n"
#. type: delimited block -
#: en/git-interpret-trailers.txt:285
@@ -32824,7 +32820,7 @@ msgid ""
"message\n"
"$ git interpret-trailers --trailer 'sign: Alice <alice@example.com>' --trailer 'sign: Bob <bob@example.com>' <msg.txt\n"
"subject\n"
-msgstr ""
+msgstr "message\n$ git interpret-trailers --trailer 'sign: Alice <alice@exemple.com>' --trailer 'sign: Bob <bob@exemple.com>' <msg.txt\nsubject\n"
#. type: delimited block -
#: en/git-interpret-trailers.txt:287 en/git-interpret-trailers.txt:299 en/git-interpret-trailers.txt:306 en/git-interpret-trailers.txt:337 en/git-interpret-trailers.txt:343 en/git-interpret-trailers.txt:349 en/git-interpret-trailers.txt:384 en/git-interpret-trailers.txt:408 en/git-interpret-trailers.txt:420 en/git-interpret-trailers.txt:433
@@ -32838,13 +32834,13 @@ msgstr "message\n"
msgid ""
"Signed-off-by: Alice <alice@example.com>\n"
"Signed-off-by: Bob <bob@example.com>\n"
-msgstr ""
+msgstr "Signed-off-by: Alice <alice@exemple.com>\nSigned-off-by: Bob <bob@exemple.com>\n"
#. type: Plain text
#: en/git-interpret-trailers.txt:293
#, priority:100
msgid "Use the `--in-place` option to edit a message file in place:"
-msgstr ""
+msgstr "Utilisez l'option `--in-place` pour modifier un fichier de message en place혻:"
#. type: delimited block -
#: en/git-interpret-trailers.txt:297 en/git-interpret-trailers.txt:418
@@ -32852,7 +32848,7 @@ msgstr ""
msgid ""
"$ cat msg.txt\n"
"subject\n"
-msgstr ""
+msgstr "$ cat msg.txt\nsubject\n"
#. type: delimited block -
#: en/git-interpret-trailers.txt:304
@@ -32862,7 +32858,7 @@ msgid ""
"$ git interpret-trailers --trailer 'Acked-by: Alice <alice@example.com>' --in-place msg.txt\n"
"$ cat msg.txt\n"
"subject\n"
-msgstr ""
+msgstr "Signed-off-by: Bob <bob@exemple.com>\n$ git interpret-trailers --trailer 'Acked-by: Alice <alice@exemple.com>' --in-place msg.txt\n$ cat msg.txt\nsubject\n"
#. type: delimited block -
#: en/git-interpret-trailers.txt:309
@@ -32870,13 +32866,13 @@ msgstr ""
msgid ""
"Signed-off-by: Bob <bob@example.com>\n"
"Acked-by: Alice <alice@example.com>\n"
-msgstr ""
+msgstr "Signed-off-by: Bob <bob@exemple.com>\nAcked-by: Alice <alice@exemple.com>\n"
#. type: Plain text
#: en/git-interpret-trailers.txt:313
#, priority:100
msgid "Extract the last commit as a patch, and add a 'Cc' and a 'Reviewed-by' trailer to it:"
-msgstr ""
+msgstr "횋xtraire le dernier commit comme une rustine, et y ajouter des lignes terminales \"Cc\" et \"Reviewed-by'혻:"
#. type: delimited block -
#: en/git-interpret-trailers.txt:318
@@ -32885,13 +32881,13 @@ msgid ""
"$ git format-patch -1\n"
"0001-foo.patch\n"
"$ git interpret-trailers --trailer 'Cc: Alice <alice@example.com>' --trailer 'Reviewed-by: Bob <bob@example.com>' 0001-foo.patch >0001-bar.patch\n"
-msgstr ""
+msgstr "$ git format-patch -1\n0001-foo.patch\n$ git interpret-trailers --trailer 'Cc: Alice <alice@exemple.com>' --trailer 'Reviewed-by: Bob <bob@exemple.com>' 0001-foo.patch >0001-bar.patch\n"
#. type: Plain text
#: en/git-interpret-trailers.txt:323
#, priority:100
msgid "Configure a 'sign' trailer with a command to automatically add a 'Signed-off-by: ' with the author information only if there is no 'Signed-off-by: ' already, and show how it works:"
-msgstr ""
+msgstr "Configurer une ligne terminale \"sign\" avec une commande pour ajouter automatiquement un \"Signed-off-by :\" avec les informations sur l'auteur uniquement s'il n'y a pas d챕j횪 de \"Signed-off-by:\", et montrer comment cela fonctionne :"
#. type: delimited block -
#: en/git-interpret-trailers.txt:327
@@ -32899,7 +32895,7 @@ msgstr ""
msgid ""
"$ cat msg1.txt\n"
"subject\n"
-msgstr ""
+msgstr "$ cat msg1.txt\nsubject\n"
#. type: delimited block -
#: en/git-interpret-trailers.txt:335
@@ -32912,7 +32908,7 @@ msgid ""
"$ git config trailer.sign.cmd 'echo \"$(git config user.name) <$(git config user.email)>\"'\n"
"$ git interpret-trailers --trailer sign <msg1.txt\n"
"subject\n"
-msgstr ""
+msgstr "message\n$ git config trailer.sign.key \"Signed-off-by: \"\n$ git config trailer.sign.ifmissing add\n$ git config trailer.sign.ifexists doNothing\n$ git config trailer.sign.cmd 'echo \"$(git config user.name) <$(git config user.email)>\"'\n$ git interpret-trailers --trailer sign <msg1.txt\nsubject\n"
#. type: delimited block -
#: en/git-interpret-trailers.txt:341
@@ -32921,7 +32917,7 @@ msgid ""
"Signed-off-by: Bob <bob@example.com>\n"
"$ cat msg2.txt\n"
"subject\n"
-msgstr ""
+msgstr "Signed-off-by: Bob <bob@exemple.com>\n$ cat msg2.txt\nsubject\n"
#. type: delimited block -
#: en/git-interpret-trailers.txt:347
@@ -32930,19 +32926,19 @@ msgid ""
"Signed-off-by: Alice <alice@example.com>\n"
"$ git interpret-trailers --trailer sign <msg2.txt\n"
"subject\n"
-msgstr ""
+msgstr "Signed-off-by: Alice <alice@exemple.com>\n$ git interpret-trailers --trailer sign <msg2.txt\nsubject\n"
#. type: delimited block -
#: en/git-interpret-trailers.txt:351
#, no-wrap, priority:100
msgid "Signed-off-by: Alice <alice@example.com>\n"
-msgstr ""
+msgstr "Signed-off-by: Alice <alice@exemple.com>\n"
#. type: Plain text
#: en/git-interpret-trailers.txt:355
#, priority:100
msgid "Configure a 'fix' trailer with a key that contains a '#' and no space after this character, and show how it works:"
-msgstr ""
+msgstr "Configurer une ligne terminale 'fix' avec une cl챕 qui contient un '#' et aucun espace apr챔s ce caract챔re, et montrer comment il fonctionne :"
#. type: delimited block -
#: en/git-interpret-trailers.txt:361
@@ -32952,19 +32948,19 @@ msgid ""
"$ git config trailer.fix.key \"Fix #\"\n"
"$ echo \"subject\" | git interpret-trailers --trailer fix=42\n"
"subject\n"
-msgstr ""
+msgstr "$ git config trailer.separators \":#\"\n$ git config trailer.fix.key \"Fix #\"\n$ echo \"subject\" | git interpret-trailers --trailer fix=42\nsubject\n"
#. type: delimited block -
#: en/git-interpret-trailers.txt:363
#, no-wrap, priority:100
msgid "Fix #42\n"
-msgstr ""
+msgstr "Fix #42\n"
#. type: Plain text
#: en/git-interpret-trailers.txt:368
#, priority:100
msgid "Configure a 'help' trailer with a cmd use a script `glog-find-author` which search specified author identity from git log in git repository and show how it works:"
-msgstr ""
+msgstr "Configurer une ligne terminale 'help' avec un cmd, utiliser un script `glog-find-author` qui recherche l'identit챕 de l'auteur sp챕cifi챕 dans le journal git dans le d챕p척t git et montrer comment cela fonctionne :"
#. type: delimited block -
#: en/git-interpret-trailers.txt:375
@@ -32975,7 +32971,7 @@ msgid ""
"test -n \"$1\" && git log --author=\"$1\" --pretty=\"%an <%ae>\" -1 || true\n"
"$ cat msg.txt\n"
"subject\n"
-msgstr ""
+msgstr "$ cat ~/bin/glog-find-author\n#!/bin/sh\ntest -n \"$1\" && git log --author=\"$1\" --pretty=\"%an <%ae>\" -1 || true\n$ cat msg.txt\nsubject\n"
#. type: delimited block -
#: en/git-interpret-trailers.txt:382
@@ -32987,7 +32983,7 @@ msgid ""
"$ git config trailer.help.cmd \"~/bin/glog-find-author\"\n"
"$ git interpret-trailers --trailer=\"help:Junio\" --trailer=\"help:Couder\" <msg.txt\n"
"subject\n"
-msgstr ""
+msgstr "message\n$ git config trailer.help.key \"Helped-by: \"\n$ git config trailer.help.ifExists \"addIfDifferentNeighbor\"\n$ git config trailer.help.cmd \"~/bin/glog-find-author\"\n$ git interpret-trailers --trailer=\"help:Junio\" --trailer=\"help:Couder\" <msg.txt\nsubject\n"
#. type: delimited block -
#: en/git-interpret-trailers.txt:387
@@ -32995,13 +32991,13 @@ msgstr ""
msgid ""
"Helped-by: Junio C Hamano <gitster@pobox.com>\n"
"Helped-by: Christian Couder <christian.couder@gmail.com>\n"
-msgstr ""
+msgstr "Helped-by: Junio C Hamano <gitster@pobox.com>\nHelped-by: Christian Couder <christian.couder@gmail.com>\n"
#. type: Plain text
#: en/git-interpret-trailers.txt:392
#, priority:100
msgid "Configure a 'ref' trailer with a cmd use a script `glog-grep` to grep last relevant commit from git log in the git repository and show how it works:"
-msgstr ""
+msgstr "Configurer une ligne terminale 'ref' avec un script `glog-grep` pour rechercher le dernier commit pertinent dans le journal git du d챕p척t git et montrer comment cela fonctionne :"
#. type: delimited block -
#: en/git-interpret-trailers.txt:399
@@ -33012,7 +33008,7 @@ msgid ""
"test -n \"$1\" && git log --grep \"$1\" --pretty=reference -1 || true\n"
"$ cat msg.txt\n"
"subject\n"
-msgstr ""
+msgstr "$ cat ~/bin/glog-grep\n#!/bin/sh\ntest -n \"$1\" && git log --grep \"$1\" --pretty=reference -1 || true\n$ cat msg.txt\nsubject\n"
#. type: delimited block -
#: en/git-interpret-trailers.txt:406
@@ -33024,19 +33020,19 @@ msgid ""
"$ git config trailer.ref.cmd \"~/bin/glog-grep\"\n"
"$ git interpret-trailers --trailer=\"ref:Add copyright notices.\" <msg.txt\n"
"subject\n"
-msgstr ""
+msgstr "message\n$ git config trailer.ref.key \"Reference-to: \"\n$ git config trailer.ref.ifExists \"replace\"\n$ git config trailer.ref.cmd \"~/bin/glog-grep\"\n$ git interpret-trailers --trailer=\"ref:Add copyright notices.\" <msg.txt\nsubject\n"
#. type: delimited block -
#: en/git-interpret-trailers.txt:410
#, no-wrap, priority:100
msgid "Reference-to: 8bc9a0c769 (Add copyright notices., 2005-04-07)\n"
-msgstr ""
+msgstr "Reference-to: 8bc9a0c769 (Add copyright notices., 2005-04-07)\n"
#. type: Plain text
#: en/git-interpret-trailers.txt:414
#, priority:100
msgid "Configure a 'see' trailer with a command to show the subject of a commit that is related, and show how it works:"
-msgstr ""
+msgstr "Configurer une ligne terminale 'see' avec une commande pour montrer le sujet d'un commit qui est li챕, et montrer comment cela fonctionne :"
#. type: delimited block -
#: en/git-interpret-trailers.txt:431
@@ -33052,19 +33048,19 @@ msgid ""
"$ git config trailer.see.cmd \"glog-ref\"\n"
"$ git interpret-trailers --trailer=see <msg.txt\n"
"subject\n"
-msgstr ""
+msgstr "see: HEAD~2\n$ cat ~/bin/glog-ref\n#!/bin/sh\ngit log -1 --oneline --format=\"%h (%s)\" --abbrev-commit --abbrev=14\n$ git config trailer.see.key \"See-also: \"\n$ git config trailer.see.ifExists \"replace\"\n$ git config trailer.see.ifMissing \"doNothing\"\n$ git config trailer.see.cmd \"glog-ref\"\n$ git interpret-trailers --trailer=see <msg.txt\nsubject\n"
#. type: delimited block -
#: en/git-interpret-trailers.txt:435
#, no-wrap, priority:100
msgid "See-also: fe3187489d69c4 (subject of related commit)\n"
-msgstr ""
+msgstr "See-also: fe3187489d69c4 (subject of related commit)\n"
#. type: Plain text
#: en/git-interpret-trailers.txt:442
#, priority:100
msgid "Configure a commit template with some trailers with empty values (using sed to show and keep the trailing spaces at the end of the trailers), then configure a commit-msg hook that uses 'git interpret-trailers' to remove trailers with empty values and to add a 'git-version' trailer:"
-msgstr ""
+msgstr "Configurer un mod챔le de commit avec quelques lignes terminales avec des valeurs vides (en utilisant sed pour afficher et conserver les espaces 횪 la fin des lignes terminales), puis configurer un crochet commit-msg qui utilise 'git interpret-trailers' pour supprimer les lignes terminales avec des valeurs vides et pour ajouter une ligne terminale 'git-version' :"
#. type: delimited block -
#: en/git-interpret-trailers.txt:446
@@ -33072,7 +33068,7 @@ msgstr ""
msgid ""
"$ cat temp.txt\n"
"***subject***\n"
-msgstr ""
+msgstr "$ cat temp.txt\n***subject***\n"
#. type: delimited block -
#: en/git-interpret-trailers.txt:448
@@ -33095,7 +33091,7 @@ msgid ""
"git interpret-trailers --trim-empty --trailer \"git-version: \\$(git describe)\" \"\\$1\" > \"\\$1.new\"\n"
"mv \"\\$1.new\" \"\\$1\"\n"
"$ chmod +x .git/hooks/commit-msg\n"
-msgstr ""
+msgstr "Fixes: Z\nCc: Z\nReviewed-by: Z\nSigned-off-by: Z\n$ sed -e 's/ Z$/ /' temp.txt > commit_template.txt\n$ git config commit.template commit_template.txt\n$ cat .git/hooks/commit-msg\n#!/bin/sh\ngit interpret-trailers --trim-empty --trailer \"git-version: \\$(git describe)\" \"\\$1\" > \"\\$1.new\"\nmv \"\\$1.new\" \"\\$1\"\n$ chmod +x .git/hooks/commit-msg\n"
#. type: Plain text
#: en/git-interpret-trailers.txt:465
@@ -34076,7 +34072,7 @@ msgstr "git-ls-remote(1)"
#: en/git-ls-remote.txt:7
#, priority:100
msgid "git-ls-remote - List references in a remote repository"
-msgstr ""
+msgstr "git-ls-remote - Liste les r챕f챕rences dans un d챕p척t distant"
#. type: Plain text
#: en/git-ls-remote.txt:15
@@ -34094,7 +34090,7 @@ msgstr ""
#: en/git-ls-remote.txt:20
#, priority:100
msgid "Displays references available in a remote repository along with the associated commit IDs."
-msgstr ""
+msgstr "Affiche les r챕f챕rences disponibles dans un d챕p척t distant ainsi que les identifiants de validation associ챕s."
#. type: Labeled list
#: en/git-ls-remote.txt:25 en/git-show-ref.txt:40
@@ -34106,7 +34102,7 @@ msgstr "--heads"
#: en/git-ls-remote.txt:34
#, priority:100
msgid "Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed. Note that `git ls-remote -h` used without anything else on the command line gives help, consistent with other git subcommands."
-msgstr ""
+msgstr "Limiter 횪 refs/heads et refs/tags, respectivement. Ces options ne s'excluent pas mutuellement ; si les deux sont donn챕es, les r챕f챕rences stock챕es dans refs/heads et refs/tags sont affich챕es. Notez que `git ls-remote -h` utilis챕 sans rien d'autre sur la ligne de commande donne de l'aide, comme les autres sous-commandes de git."
#. type: Labeled list
#: en/git-ls-remote.txt:35
@@ -34118,13 +34114,13 @@ msgstr "--refs"
#: en/git-ls-remote.txt:37
#, priority:100
msgid "Do not show peeled tags or pseudorefs like `HEAD` in the output."
-msgstr ""
+msgstr "Ne pas afficher les 챕tiquettes pel챕es ou les pseudorefs comme `HEAD` dans la sortie."
#. type: Plain text
#: en/git-ls-remote.txt:41
#, priority:100
msgid "Do not print remote URL to stderr."
-msgstr ""
+msgstr "Ne pas afficher l'URL distante sur stderr."
#. type: Labeled list
#: en/git-ls-remote.txt:42
@@ -34136,13 +34132,13 @@ msgstr "--upload-pack=<exec>"
#: en/git-ls-remote.txt:47
#, priority:100
msgid "Specify the full path of 'git-upload-pack' on the remote host. This allows listing references from repositories accessed via SSH and where the SSH daemon does not use the PATH configured by the user."
-msgstr ""
+msgstr "Sp챕cifier le chemin complet de 'git-upload-pack' sur l'h척te distant. Cela permet de lister des r챕f챕rences provenant de d챕p척ts accessibles via SSH et pour lesquels le d챕mon SSH n'utilise pas le PATH configur챕 par l'utilisateur."
#. type: Plain text
#: en/git-ls-remote.txt:53
#, priority:100
msgid "Exit with status \"2\" when no matching refs are found in the remote repository. Usually the command exits with status \"0\" to indicate it successfully talked with the remote repository, whether it found any matching refs."
-msgstr ""
+msgstr "Sortir avec l'챕tat \"2\" lorsqu'aucune r챕f챕rence correspondante n'est trouv챕e dans le d챕p척t distant. En g챕n챕ral, la commande sort avec le statut \"0\" pour indiquer qu'elle a r챕ussi 횪 dialoguer avec le d챕p척t distant, qu'elle ait trouv챕 ou non des r챕f챕rences correspondantes."
#. type: Labeled list
#: en/git-ls-remote.txt:54
@@ -34154,7 +34150,7 @@ msgstr "--get-url"
#: en/git-ls-remote.txt:58
#, priority:100
msgid "Expand the URL of the given remote repository taking into account any \"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit without talking to the remote."
-msgstr ""
+msgstr "D챕velopper l'URL du d챕p척t distant donn챕 en prenant en compte tout param챔tre de configuration \"url.<base>.insteadOf\" (Voir linkgit:git-config[1]) et quitte sans parler au d챕p척t distant."
#. type: Labeled list
#: en/git-ls-remote.txt:59
@@ -34166,13 +34162,13 @@ msgstr "--symref"
#: en/git-ls-remote.txt:64
#, priority:100
msgid "In addition to the object pointed by it, show the underlying ref pointed by it when showing a symbolic ref. Currently, upload-pack only shows the symref HEAD, so it will be the only one shown by ls-remote."
-msgstr ""
+msgstr "En plus de l'objet point챕 par lui, afficher la r챕f sous-jacente point챕e par lui lors de l'affichage d'une r챕f symbolique. Actuellement, upload-pack n'affiche que la symref HEAD, qui sera donc la seule affich챕e par ls-remote."
#. type: Plain text
#: en/git-ls-remote.txt:74
#, priority:100
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. Supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable. See linkgit:git-for-each-ref[1] for more sort options, but be aware keys like `committerdate` that require access to the objects themselves will not work for refs whose objects have not yet been fetched from the remote, and will give a `missing object` error."
-msgstr ""
+msgstr "Trier sur la base de la cl챕 donn챕e. Pr챕fixe `-` pour trier par ordre d챕croissant de la valeur. Supporte \"version:refname\" ou \"v:refname\" (les noms de balises sont trait챕s comme des versions). L'ordre de tri \"version:refname\" peut 챕galement 챗tre affect챕 par la variable de configuration \"versionsort.suffix\". Voir linkgit:git-for-each-ref[1] pour plus d'options de tri, mais soyez conscient que des cl챕s comme `committerdate` qui requi챔rent l'acc챔s aux objets eux-m챗mes ne fonctionneront pas pour les refs dont les objets n'ont pas encore 챕t챕 r챕cup챕r챕s du distant, et donneront une erreur `missing object` (objet manquant)."
#. type: Plain text
#: en/git-ls-remote.txt:82
@@ -34184,7 +34180,7 @@ msgstr "Transmettre la cha챤ne donn챕e au serveur lors d'une communication utili
#: en/git-ls-remote.txt:87
#, priority:100
msgid "The \"remote\" repository to query. This parameter can be either a URL or the name of a remote (see the GIT URLS and REMOTES sections of linkgit:git-fetch[1])."
-msgstr ""
+msgstr "Le d챕p척t \"distant\" 횪 interroger. Ce param챔tre peut 챗tre une URL ou le nom d'un d챕p척t distant (voir les sections GIT URLS et REMOTES de linkgit:git-fetch[1])."
#. type: Labeled list
#: en/git-ls-remote.txt:88
@@ -34196,7 +34192,7 @@ msgstr "<motif>..."
#: en/git-ls-remote.txt:98
#, ignore-ellipsis, priority:100
msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown. When <patterns>... are specified, only references matching one or more of the given patterns are displayed. Each pattern is interpreted as a glob (see `glob` in linkgit:gitglossary[7]) which is matched against the \"tail\" of a ref, starting either from the start of the ref (so a full name like `refs/heads/foo` matches) or from a slash separator (so `bar` matches `refs/heads/bar` but not `refs/heads/foobar`)."
-msgstr ""
+msgstr "Si elle n'est pas sp챕cifi챕e, toutes les r챕f챕rences, apr챔s le filtrage effectu챕 avec --heads et --tags, sont affich챕es. Lorsque <motif>... est sp챕cifi챕, seules les r챕f챕rences correspondant 횪 un ou plusieurs des motifs donn챕s sont affich챕es. Chaque motif est interpr챕t챕 comme un glob (voir `glob` dans linkgit:gitglossary[7]) qui est compar챕 횪 la \"queue\" d'une r챕f챕rence, en commen챌ant soit par le d챕but de la r챕f챕rence (ainsi un nom complet comme `refs/heads/foo` correspond), soit par un s챕parateur (ainsi `bar` correspond 횪 `refs/heads/bar` mais pas 횪 `refs/heads/foobar`)."
#. type: delimited block -
#: en/git-ls-remote.txt:109
@@ -34208,7 +34204,7 @@ msgid ""
"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
"0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-msgstr ""
+msgstr "$ git ls-remote --tags .\nd6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\nf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\nc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
#. type: delimited block -
#: en/git-ls-remote.txt:113
@@ -34217,7 +34213,7 @@ msgid ""
"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc\n"
"5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/seen\n"
-msgstr ""
+msgstr "$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc\n5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\nc781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/seen\n"
#. type: delimited block -
#: en/git-ls-remote.txt:120
@@ -34229,7 +34225,7 @@ msgid ""
"f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
-msgstr ""
+msgstr "$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n$ git ls-remote --tags korg v\\*\nd6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\nf25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\nc5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
#. type: Plain text
#: en/git-ls-remote.txt:125
@@ -34493,79 +34489,79 @@ msgid ""
"'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n]\n"
"\t [--[no-]scissors] [--quoted-cr=<action>]\n"
"\t <msg> <patch>\n"
-msgstr ""
+msgstr "'git mailinfo' [-k|-b] [-u | --encoding=<encodage> | -n]\n\t [--[no-]scissors] [--quoted-cr=<action>]\n\t <msg> <rustine>\n"
#. type: Plain text
#: en/git-mailinfo.txt:25
#, priority:100
msgid "Reads a single e-mail message from the standard input, and writes the commit log message in <msg> file, and the patches in <patch> file. The author name, e-mail and e-mail subject are written out to the standard output to be used by 'git am' to create a commit. It is usually not necessary to use this command directly. See linkgit:git-am[1] instead."
-msgstr ""
+msgstr "Lit un seul message 챕lectronique 횪 partir de l'entr챕e standard et 챕crit le message du journal de validation dans le fichier <msg> et les correctifs dans le fichier <rustine>. Le nom de l'auteur, l'adresse 챕lectronique et l'objet du message sont 챕crits sur la sortie standard afin d'챗tre utilis챕s par \"git am\" pour cr챕er un commit. Il n'est g챕n챕ralement pas n챕cessaire d'utiliser cette commande directement. Voir plut척t linkgit:git-am[1]."
#. type: Plain text
#: en/git-mailinfo.txt:34
#, priority:100
msgid "Usually the program removes email cruft from the Subject: header line to extract the title line for the commit log message. This option prevents this munging, and is most useful when used to read back 'git format-patch -k' output."
-msgstr ""
+msgstr "Habituellement, le programme supprime les messages 챕lectroniques de la ligne d'en-t챗te Subject : afin d'extraire la ligne de titre du message du journal de commit. Cette option emp챗che ce broyage, et est surtout utile pour relire la sortie de 'git format-patch -k'."
#. type: Plain text
#: en/git-mailinfo.txt:36
#, priority:100
msgid "Specifically, the following are removed until none of them remain:"
-msgstr ""
+msgstr "Plus pr챕cis챕ment, les 챕l챕ments suivants sont supprim챕s jusqu'횪 ce qu'il n'en reste plus aucun :"
#. type: Plain text
#: en/git-mailinfo.txt:39
#, priority:100
msgid "Leading and trailing whitespace."
-msgstr ""
+msgstr "Les espaces blancs de d챕but et de fin."
#. type: Plain text
#: en/git-mailinfo.txt:41
#, priority:100
msgid "Leading `Re:`, `re:`, and `:`."
-msgstr ""
+msgstr "Ent챗tes 'Re:', 're:' et ':'."
#. type: Plain text
#: en/git-mailinfo.txt:43
#, priority:100
msgid "Leading bracketed strings (between `[` and `]`, usually"
-msgstr ""
+msgstr "Cha챤nes entre crochets de d챕but (entre '[' et ']', g챕n챕ralement"
#. type: Plain text
#: en/git-mailinfo.txt:44
#, priority:100
msgid "`[PATCH]`)."
-msgstr ""
+msgstr "`[PATCH]`)."
#. type: Plain text
#: en/git-mailinfo.txt:48
#, priority:100
msgid "Finally, runs of whitespace are normalized to a single ASCII space character."
-msgstr ""
+msgstr "Enfin, les suites d'espaces blancs sont normalis챕es 횪 un seul caract챔re espace ASCII."
#. type: Plain text
#: en/git-mailinfo.txt:53
#, priority:100
msgid "When -k is not in effect, all leading strings bracketed with '[' and ']' pairs are stripped. This option limits the stripping to only the pairs whose bracketed string contains the word \"PATCH\"."
-msgstr ""
+msgstr "Lorsque l'option -k n'est pas activ챕e, toutes les cha챤nes de caract챔res principales entre crochets avec les paires '[' et ']' sont supprim챕es. Cette option limite l'챕limination aux paires dont la cha챤ne entre crochets contient le mot \"PATCH\"."
#. type: Plain text
#: en/git-mailinfo.txt:60
#, priority:100
msgid "The commit log message, author name and author email are taken from the e-mail, and after minimally decoding MIME transfer encoding, re-coded in the charset specified by `i18n.commitEncoding` (defaulting to UTF-8) by transliterating them. This used to be optional but now it is the default."
-msgstr ""
+msgstr "Le message du journal de commit, le nom de l'auteur et l'adresse de courriel de l'auteur sont extraits du courriel, et apr챔s un d챕codage minimal de l'encodage de transfert MIME, recod챕s dans le jeu de caract챔res sp챕cifi챕 par `i18n.commitEncoding` (UTF-8 par d챕faut) en les translitt챕rant. Ceci 챕tait optionnel, mais c'est maintenant la valeur par d챕faut."
#. type: Plain text
#: en/git-mailinfo.txt:63
#, priority:100
msgid "Note that the patch is always used as-is without charset conversion, even with this flag."
-msgstr ""
+msgstr "Notez que la rustine est toujours utilis챕e telle quelle sans conversion de jeu de caract챔res, m챗me avec ce drapeau."
#. type: Plain text
#: en/git-mailinfo.txt:67
#, priority:100
msgid "Similar to -u. But when re-coding, the charset specified here is used instead of the one specified by `i18n.commitEncoding` or UTF-8."
-msgstr ""
+msgstr "Comme pour -u. Mais lors du recodage, le jeu de caract챔res sp챕cifi챕 ici est utilis챕 au lieu de celui sp챕cifi챕 par `i18n.commitEncoding` ou UTF-8."
#. type: Plain text
#: en/git-mailinfo.txt:70
@@ -34577,37 +34573,37 @@ msgstr "D챕sactiver le r챕-encodage de jeu de caract챔re des m챕ta-donn챕es."
#: en/git-mailinfo.txt:75
#, priority:100
msgid "Copy the Message-ID header at the end of the commit message. This is useful in order to associate commits with mailing list discussions."
-msgstr ""
+msgstr "Copier l'en-t챗te Message-ID 횪 la fin du message de validation. Ceci est utile pour associer les commits aux discussions sur la liste de diffusion."
#. type: Plain text
#: en/git-mailinfo.txt:83
#, priority:100
msgid "Remove everything in body before a scissors line (e.g. \"-- >8 --\"). The line represents scissors and perforation marks, and is used to request the reader to cut the message at that line. If that line appears in the body of the message before the patch, everything before it (including the scissors line itself) is ignored when this option is used."
-msgstr ""
+msgstr "Retirer tout dans le corps avant une ligne de ciseaux (p. ex. \"- ->8 --\"). La ligne repr챕sente les ciseaux et les marques de perforation, et est utilis챕e pour demander au lecteur de couper le message 횪 cette ligne. Si cette ligne appara챤t dans le corps du message avant la rustine, tout avant elle (y compris la ligne de ciseaux elle-m챗me) est ignor챕 lorsque cette option est utilis챕e."
#. type: Plain text
#: en/git-mailinfo.txt:88
#, priority:100
msgid "This is useful if you want to begin your message in a discussion thread with comments and suggestions on the message you are responding to, and to conclude it with a patch submission, separating the discussion and the beginning of the proposed commit log message with a scissors line."
-msgstr ""
+msgstr "Ceci est utile si vous voulez commencer votre message dans un fil de discussion avec des commentaires et des suggestions sur le message auquel vous r챕pondez, et pour le conclure avec une proposition de rustine, en s챕parant la discussion du d챕but du message de journal de validation avec une ligne de ciseaux."
#. type: Plain text
#: en/git-mailinfo.txt:90
#, priority:100
msgid "This can be enabled by default with the configuration option mailinfo.scissors."
-msgstr ""
+msgstr "Ceci peut 챗tre activ챕 par d챕faut avec l'option de configuration mailinfo.scisors."
#. type: Plain text
#: en/git-mailinfo.txt:93
#, priority:100
msgid "Ignore scissors lines. Useful for overriding mailinfo.scissors settings."
-msgstr ""
+msgstr "Ignorer les lignes de ciseaux. Utile pour remplacer les param챔tres mailinfo.scissors."
#. type: Plain text
#: en/git-mailinfo.txt:98
#, priority:100
msgid "Action when processes email messages sent with base64 or quoted-printable encoding, and the decoded lines end with a CRLF instead of a simple LF."
-msgstr ""
+msgstr "Action lors du traitement des messages 챕lectroniques envoy챕s en base64 ou en encodage cit챕 ('quoted-printable'), et que les lignes d챕cod챕es finissent par une CRLF au lieu d'un simple LF."
#. type: Plain text
#: en/git-mailinfo.txt:100
@@ -34619,43 +34615,43 @@ msgstr "Les actions valides sont :"
#: en/git-mailinfo.txt:103
#, priority:100
msgid "`nowarn`: Git will do nothing when such a CRLF is found."
-msgstr ""
+msgstr "`nowarn`혻: Gitne fera rien quand des CRLF sont trouv챕es."
#. type: Plain text
#: en/git-mailinfo.txt:104
#, priority:100
msgid "`warn`: Git will issue a warning for each message if such a CRLF is"
-msgstr ""
+msgstr "`warn`혻: Git va 챕mettre un avertissement pour chaque message si une s챕quence CRLF est"
#. type: Plain text
#: en/git-mailinfo.txt:105
#, priority:100
msgid "found."
-msgstr ""
+msgstr "trouv챕e."
#. type: Plain text
#: en/git-mailinfo.txt:106
#, priority:100
msgid "`strip`: Git will convert those CRLF to LF."
-msgstr ""
+msgstr "`strip`��: Git convertira les CRLF en LF."
#. type: Plain text
#: en/git-mailinfo.txt:110
#, priority:100
msgid "The default action could be set by configuration option `mailinfo.quotedCR`. If no such configuration option has been set, `warn` will be used."
-msgstr ""
+msgstr "L'action par d챕faut peut 챗tre d챕finie par l'option de configuration `mailinfo.quotedCR`. Si aucune option de configuration n'a 챕t챕 d챕finie, `warn` sera utilis챕."
#. type: Labeled list
#: en/git-mailinfo.txt:111
#, no-wrap, priority:100
msgid "<msg>"
-msgstr ""
+msgstr "<message>"
#. type: Plain text
#: en/git-mailinfo.txt:114
#, priority:100
msgid "The commit log message extracted from e-mail, usually except the title line which comes from e-mail Subject."
-msgstr ""
+msgstr "Le message de journal de validation extrait du courriel, habituellement sans la ligne de titre qui vient du Sujet du courriel."
#. type: Labeled list
#: en/git-mailinfo.txt:115
@@ -34667,7 +34663,7 @@ msgstr "<rustine>"
#: en/git-mailinfo.txt:117
#, priority:100
msgid "The patch extracted from e-mail."
-msgstr ""
+msgstr "La rustine extraite du courriel."
#. type: Title =
#: en/git-mailsplit.txt:2
@@ -39621,7 +39617,7 @@ msgstr "--no-filter"
#: en/git-pack-objects.txt:307
#, priority:100
msgid "Turns off any previous `--filter=` argument."
-msgstr "D챕sactiver tout argument `--filter=` pr챕c챕dent."
+msgstr "D챕sactive tout argument `--filter=` pr챕c챕dent."
#. type: Labeled list
#: en/git-pack-objects.txt:308 en/rev-list-options.txt:998
@@ -48096,7 +48092,7 @@ msgstr ""
#: en/git-revert.txt:21
#, priority:100
msgid "Given one or more existing commits, revert the changes that the related patches introduce, and record some new commits that record them. This requires your working tree to be clean (no modifications from the HEAD commit)."
-msgstr "횋tant donn챕 un ou plusieurs commits existants, appliquer la modification que chacun d'eux introduit, en enregistrant un nouveau commit pour chacun. Cela n챕cessite que votre arbre de travail soit propre (pas de modification depuis le commit HEAD)."
+msgstr "횋tant donn챕 un ou plusieurs commits existants, inverser la modification que chacun d'eux introduit, en enregistrant un nouveau commit pour chacun. Cela n챕cessite que votre arbre de travail soit propre (pas de modification depuis le commit HEAD)."
#. type: Plain text
#: en/git-revert.txt:30
@@ -48669,7 +48665,7 @@ msgstr ""
#: en/git-rev-parse.txt:168
#, no-wrap, priority:80
msgid "--branches[=pattern]"
-msgstr "--branches[=<motif>]"
+msgstr "--branches[=<pattern>]"
#. type: Labeled list
#: en/git-rev-parse.txt:169
@@ -52665,14 +52661,7 @@ msgid ""
"$ git commit -m 'Massive' # commit fully tested changes\n"
"$ git switch fixup-branch # switch to another branch\n"
"$ git stash pop # to finish work on the saved changes\n"
-msgstr ""
-"# ... travail, travail, travail ...\n"
-"$ git add --patch foo # ajouter des modifications sans relation 횪 l'index\n"
-"$ git stash push --keep-staged # remiser toutes les autres modifications\n"
-"$ #... code, code, code, pour finir les modifications actuelles\n"
-"$ git commit -m 'Massive' # valider une modification compl챔tement test챕e\n"
-"$ git switch branch-correctif # basculer sur une autre branche\n"
-"$ git stash pop # pour terminer de travailler sur les modifications enregistr챕es\n"
+msgstr "# ... travail, travail, travail ...\n$ git add --patch foo # ajouter des modifications sans relation 횪 l'index\n$ git stash push --keep-staged # remiser toutes les autres modifications\n$ #... code, code, code, pour finir les modifications actuelles\n$ git commit -m 'Massive' # valider une modification compl챔tement test챕e\n$ git switch branche-correctif # basculer sur une autre branche\n$ git stash pop # pour terminer de travailler sur les modifications enregistr챕es\n"
#. type: Labeled list
#: en/git-stash.txt:375
@@ -56939,7 +56928,7 @@ msgstr "Ne r챕pertorier que les 챕tiquettes qui contiennent le commit sp챕cifi챕
#: en/git-tag.txt:153
#, priority:240
msgid "Only list tags which don't contain the specified commit (HEAD if not specified). Implies `--list`."
-msgstr "Ne r챕pertorier que les 챕tiquettes qui contiennent le commit sp챕cifi챕 (HEAD si non sp챕cifi챕). Implique `--list`."
+msgstr "Ne r챕pertorier que les 챕tiquettes qui ne contiennent pas le commit sp챕cifi챕 (HEAD si non sp챕cifi챕). Implique `--list`."
#. type: Plain text
#: en/git-tag.txt:157
@@ -67543,7 +67532,7 @@ msgstr "Notez que sans r챕챕criture des parents, il n'est pas vraiment possible
#: en/rev-list-options.txt:502
#, no-wrap, priority:260
msgid "--full-history with parent rewriting"
-msgstr "--full-history sans r챕챕criture des parents"
+msgstr "--full-history avec r챕챕criture des parents"
#. type: Plain text
#: en/rev-list-options.txt:505
diff --git a/po/documentation.ru.po b/po/documentation.ru.po
index 9b0c44647672d7aebc708cec426b96be4a5a3c3a..bbbcca4a99c743912d92e6a204045d5c655c1827 100644
--- a/po/documentation.ru.po
+++ b/po/documentation.ru.po
@@ -2,7 +2,7 @@
# Copyright (C) 2019
# This file is distributed under the same license as the Git package.
msgid ""
-msgstr "Project-Id-Version: Git Documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-05-18 19:52+0200\nPO-Revision-Date: 2023-07-13 20:12+0000\nLast-Translator: Radiy <notron12460@gmail.com>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: ru\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\nX-Generator: Weblate 5.0-dev\n"
+msgstr "Project-Id-Version: Git Documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-05-18 19:52+0200\nPO-Revision-Date: 2023-08-05 08:03+0000\nLast-Translator: Evgeny Petrov <eupetrov@yandex.ru>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: ru\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\nX-Generator: Weblate 5.0-dev\n"
#. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:769 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:146 en/git-status.txt:31
@@ -6259,7 +6259,7 @@ msgstr "--progress"
#: en/fetch-options.txt:297 en/git-bundle.txt:119 en/git-pack-objects.txt:196 en/git-push.txt:401
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
-msgstr ""
+msgstr "��棘均�筠�� 極棘 �劇棘剋�逵戟龜� 戟逵極�逵勻剋�筠��� 勻 ��逵戟畇逵��戟�橘 勻�勻棘畇 棘�龜閨棘克, 筠�剋龜 ��棘� 極棘�棘克 極棘畇克剋��筠戟 克 �筠�劇龜戟逵剋�. 圭剋逵均 -q 劇筠戟�筠� ��棘 �劇棘剋�逵戟龜筠: � ��龜劇 �剋逵均棘劇 極�棘均�筠�� 戟逵極�逵勻剋�筠��� 勻 ��逵戟畇逵��戟�橘 勻�勻棘畇 棘�龜閨棘克 畇逵菌筠 勻 �棘劇 �剋��逵筠, 克棘均畇逵 ��棘� 極棘�棘克 戟筠 極棘畇克剋��筠戟 克 �筠�劇龜戟逵剋�."
#. type: Labeled list
#: en/fetch-options.txt:298 en/git-ls-remote.txt:75 en/git-push.txt:216
diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po
index 90cc91d819d4314b397a9d544c670d955007df2e..256d5fdd5cd5e9e2c2a1af87285f08fbbb77158c 100644
--- a/po/documentation.zh_HANS-CN.po
+++ b/po/documentation.zh_HANS-CN.po
@@ -3,7 +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\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-02-26 14:06+0100\nPO-Revision-Date: 2023-07-19 15:02+0000\nLast-Translator: 燁껃ㅄ��Ъ浴� <ttdlyu@163.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 5.0-dev\n"
+msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-02-26 14:06+0100\nPO-Revision-Date: 2023-08-03 19:53+0000\nLast-Translator: 燁껃ㅄ��Ъ浴� <ttdlyu@163.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 5.0-dev\n"
#. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:769 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:146 en/git-status.txt:31
@@ -36534,7 +36534,7 @@ msgstr "'git mktag'\n"
#: en/git-mktag.txt:19
#, priority:100
msgid "Reads a tag contents on standard input and creates a tag object. The output is the new tag's <object> identifier."
-msgstr ""
+msgstr "瑥삣룚�뉐뇛渦볟뀯訝�쉪�뉒��끻�亮뜹닗兩뷰�訝ゆ젃嶺얍�穩▲�귟풏�뷸삸�경젃嶺양쉪 <object> �뉓칳寧╉��"
#. type: Plain text
#: en/git-mktag.txt:23
@@ -39400,7 +39400,7 @@ msgstr "--keep-true-parents"
#: en/git-pack-objects.txt:299
#, priority:100
msgid "With this option, parents that are hidden by grafts are packed nevertheless."
-msgstr ""
+msgstr "�싪퓝瓦숂쭕�방퀡竊뚩˙燁삥쨳�⑵쫮�뽫쉪�뜻칾瓦섉삸鴉싪˙�볟똿��"
#. type: Plain text
#: en/git-pack-objects.txt:304
@@ -39508,7 +39508,7 @@ msgstr "--delta-islands"
#: en/git-pack-objects.txt:349
#, priority:100
msgid "Restrict delta matches based on \"islands\". See DELTA ISLANDS below."
-msgstr ""
+msgstr "�방뜮 �쒎쿆掠욋�� �먨댍罌욇뇧�백뀓�귟��귡쁾訝뗦뻼�꾢쥭�뤷뙶�띲��"
#. type: Title -
#: en/git-pack-objects.txt:352
@@ -42527,43 +42527,43 @@ msgstr "倻귝옖�뉐츣雅� `<branch>`竊�`git rebase` 鴉싪눎�ⓩ돢烏� `git switch <b
#: en/git-rebase.txt:28
#, priority:100
msgid "If `<upstream>` is not specified, the upstream configured in `branch.<name>.remote` and `branch.<name>.merge` options will be used (see linkgit:git-config[1] for details) and the `--fork-point` option is assumed. If you are currently not on any branch or if the current branch does not have a configured upstream, the rebase will abort."
-msgstr ""
+msgstr "倻귝옖�ゆ뙁若� `<upstream>`竊뚦컛鵝욜뵪 `branch.<name>.remote` �� `branch.<name>.merge` �됮」訝�뀓營�쉪訝딀만竊덅�鰲� linkgit:git-config[1]竊됵펽亮뜹걞若싦슴�� `-fork-point`�됮」�� 倻귝옖�ⓨ퐪�띴툖�ⓧ뻣鵝뺝늽��툓竊뚧닑�끻퐪�띶늽��깹�됮뀓營�툓歷몌펽�섇읃�띴퐳鴉싦릎閭㏂��"
#. type: Plain text
#: en/git-rebase.txt:35
#, priority:100
msgid "All changes made by commits in the current branch but that are not in `<upstream>` are saved to a temporary area. This is the same set of commits that would be shown by `git log <upstream>..HEAD`; or by `git log 'fork_point'..HEAD`, if `--fork-point` is active (see the description on `--fork-point` below); or by `git log HEAD`, if the `--root` option is specified."
-msgstr ""
+msgstr "壤볟뎺�녷뵱訝�쉪���됪룓雅ㅶ��싩쉪�밧뒯竊뚥퐜訝띶쑉 `<upstream>` 訝�쉪竊뚪꺗鴉싪˙岳앭춼�겻�訝や릿�뜹뙷�잆�� 瓦쇾툗 `git log <upstream>..HEAD` �� `git log 'fork_point'..HEAD` ���양ㅊ�꾣룓雅ㅷ쎑�뚳펷倻귝옖��뵪雅� `-fork-point`竊뚩��귡쁾訝뗦뻼�념틢 `-fork-point`�꾣룒瓦곤펹竊쎿닑�낉펽倻귝옖�뉐츣雅� `--root` �됮」竊뚦닕訝� `git log HEAD` ���양ㅊ�꾣룓雅ㅷ쎑�뚣��"
#. type: Plain text
#: en/git-rebase.txt:40
#, priority:100
msgid "The current branch is reset to `<upstream>` or `<newbase>` if the `--onto` option was supplied. This has the exact same effect as `git reset --hard <upstream>` (or `<newbase>`). `ORIG_HEAD` is set to point at the tip of the branch before the reset."
-msgstr ""
+msgstr "倻귝옖�먧풘雅� `--onto` �됮」竊뚦퐪�띶늽��폏�띸쉰訝� `<upstream>` �� `<newbase>`�� 瓦쇾툗 `git reset --hard <upstream>`竊덃닑 `<newbase>`竊됬쉪�덃옖若뚦뀲�멨릪��`ORIG_HEAD` 溫양쉰訝뷸뙁�묌뇥營�뎺�녷뵱�꾦《塋���"
#. type: Plain text
#: en/git-rebase.txt:47
#, priority:100
msgid "`ORIG_HEAD` is not guaranteed to still point to the previous branch tip at the end of the rebase if other commands that write that pseudo-ref (e.g. `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, see linkgit:gitrevisions[7])."
-msgstr ""
+msgstr "倻귝옖�③뇥營�퓝葉뗤릎鵝욜뵪雅녶끀餓뽩넍�δ섈凉뺟뵪�꾢뫝餓ㅿ펷堊뗥쫩 `git reset`竊됵펽弱긴툖�썰퓷瑥� `ORIG_HEAD` �③뇥營�퍜�잍뿶餓띸꽫�뉐릲�띴�訝ゅ늽��쉪�녷뵱�먪ㅊ�귚툖瓦뉛펽鵝욜뵪壤볟뎺�녷뵱�� 凉뺟뵪�ε퓱竊덂뜵 `@{1}`竊뚦뢿鰲� linkgit:gitrevisions[7]竊됧룾餓θ���뎺訝�訝ゅ늽��쉪�녷뵱�먪ㅊ��"
#. type: Plain text
#: en/git-rebase.txt:53
#, priority:100
msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in `HEAD` which introduce the same textual changes as a commit in `HEAD..<upstream>` are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
-msgstr ""
+msgstr "�뜹릮竊뚦뀍�띴퓷耶섇쑉訝닸뿶�뷴윜�꾣룓雅ㅵ컛�됮『佯뤻�먧��띷뼭佯붺뵪�겼퐪�띶늽���귟�力ⓩ꼷竊�`HEAD` 訝�뻣鵝뺜툗 `HEAD...<upstream>` 訝�쉪�먧벡�됬쎑�뚧뻼耶쀦뵻�①쉪�먧벡�썰폏熬ョ쐛�ο펷阿잌갚���竊뚥툓歷멨럴瀯뤸렏�쀧쉪烏δ툈竊뚦쫩�쒏룓雅ㅴ에��닑�띌뿴�념툖�뚳펽弱긴폏熬ヨ럼瓦뉛펹��"
#. type: Plain text
#: en/git-rebase.txt:60
#, priority:100
msgid "It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To check out the original `<branch>` and remove the `.git/rebase-apply` working files, use the command `git rebase --abort` instead."
-msgstr ""
+msgstr "�덂뭉鸚김뇰�됧룾�썲��닺�瓦뉒쮮�졿퀡若뚦뀲�ゅ뒯瓦쏂죱�� �ⓨ퓚窈삭㎗�녑릦亮뜹ㅁ兀ι뿮窯섓펽�뜹릮瓦먫죱 `git rebase --continue`�� �╊�燁띷뼶力뺞삸鵝욜뵪 `git rebase --skip` 瀯뺠퓝野쇠눜�덂뭉鸚김뇰�꾣룓雅ㅳ�� 誤곫��ε렅冶뗧쉪 `<branch>` 亮띄㎉�� `.git/rebase-apply` 藥δ퐳�뉏뻑竊뚩�鵝욜뵪 `git rebase --abort` �썰빱��"
#. type: Plain text
#: en/git-rebase.txt:62
#, priority:100
msgid "Assume the following history exists and the current branch is \"topic\":"
-msgstr ""
+msgstr "�뉓�耶섇쑉餓δ툔�녶뤁溫겼퐬竊뚦퐪�띶늽��맏 \"topic\"竊�"
#. type: delimited block -
#: en/git-rebase.txt:67
@@ -42572,13 +42572,13 @@ msgid ""
" A---B---C topic\n"
" /\n"
" D---E---F---G master\n"
-msgstr ""
+msgstr " A---B---C topic\n /\n D---E---F---G master\n"
#. type: Plain text
#: en/git-rebase.txt:70
#, priority:100
msgid "From this point, the result of either of the following commands:"
-msgstr ""
+msgstr "餓롨퓳訝��방씎�뗰펽餓δ툔餓삡��썰빱�꾤퍜�쒒꺗��쫩閭ㅿ폏"
#. type: Plain text
#: en/git-rebase.txt:74
@@ -42594,7 +42594,7 @@ msgstr ""
#: en/git-rebase.txt:76
#, priority:100
msgid "would be:"
-msgstr ""
+msgstr "�ｅ갚�� :"
#. type: delimited block -
#: en/git-rebase.txt:81
@@ -42603,7 +42603,7 @@ msgid ""
" A'--B'--C' topic\n"
" /\n"
" D---E---F---G master\n"
-msgstr ""
+msgstr " A'--B'--C' topic\n /\n D---E---F---G master\n"
#. type: Plain text
#: en/git-rebase.txt:86
@@ -42612,13 +42612,13 @@ msgid ""
"*NOTE:* The latter form is just a short-hand of `git checkout topic`\n"
"followed by `git rebase master`. When rebase exits `topic` will\n"
"remain the checked-out branch.\n"
-msgstr ""
+msgstr "*力⑨폏* �롣�燁띶숱凉뤷룵�� `git checkout topic` �꾤��쇻��\n�롦렏 `git rebase master`�귛퐪 rebase ���뷸뿶竊�`topic` 弱�\n餓띷삸藥꿰��븀쉪�녷뵱��\n"
#. type: Plain text
#: en/git-rebase.txt:93
#, priority:100
msgid "If the upstream branch already contains a change you have made (e.g., because you mailed a patch which was applied upstream), then that commit will be skipped and warnings will be issued (if the 'merge' backend is used). For example, running `git rebase master` on the following history (in which `A'` and `A` introduce the same set of changes, but have different committer information):"
-msgstr ""
+msgstr "倻귝옖訝딀만�녷뵱藥꿰퍘�끻맜雅녷궓���싩쉪岳�뵻竊덁풃倻귨펽�졽맏�③궙野꾤쉪烏δ툈熬ュ틪�ⓨ댆雅녵툓歷몌펹竊뚪궍阿덅��먧벡弱녻˙瓮녘퓝竊뚦뭉�묈눣鈺�몜竊덂쫩�쒍슴�ⓧ틙 �쒎릦亮뜯�� �롥룿竊됥�� 堊뗥쫩竊뚦쑉餓δ툔�녶뤁溫겼퐬訝딂퓧烏� `git rebase master`竊덂끀訝� `A'` �� `A` 凉뺝뀯雅녺쎑�뚨쉪�섉쎍�놅펽鵝녷룓雅ㅸ�끺에��툖�뚳펹竊�"
#. type: delimited block -
#: en/git-rebase.txt:98
@@ -42627,13 +42627,13 @@ msgid ""
" A---B---C topic\n"
" /\n"
" D---E---A'---F master\n"
-msgstr ""
+msgstr " A---B---C topic\n /\n D---E---A'---F master\n"
#. type: Plain text
#: en/git-rebase.txt:101
#, priority:100
msgid "will result in:"
-msgstr ""
+msgstr "弱녶��� :"
#. type: delimited block -
#: en/git-rebase.txt:106
@@ -42651,13 +42651,13 @@ msgstr ""
#: en/git-rebase.txt:111
#, priority:100
msgid "Here is how you would transplant a topic branch based on one branch to another, to pretend that you forked the topic branch from the latter branch, using `rebase --onto`."
-msgstr ""
+msgstr "訝뗩씊��쫩鵝뺜슴�� `rebase --onto` 弱녶읃雅롣�訝ゅ늽��쉪�방�㎩늽��㎉濾띶댆�╊�訝ゅ늽��펽餓ε걞獒끿돶�㎩늽��삸餓롥릮訝�訝ゅ늽��늽�됭�뚧씎��"
#. type: Plain text
#: en/git-rebase.txt:115
#, priority:100
msgid "First let's assume your 'topic' is based on branch 'next'. For example, a feature developed in 'topic' depends on some functionality which is found in 'next'."
-msgstr ""
+msgstr "腰뽩뀍竊뚧닊餓у걞溫� 'topic' �뷰틢 'next' �녷뵱�� 堊뗥쫩竊�'topic' 訝���묊쉪�잒꺗堊앲탺雅� 'next' 訝�쉪�먧틳�잒꺗��"
#. type: delimited block -
#: en/git-rebase.txt:122
@@ -42679,7 +42679,7 @@ msgstr ""
#: en/git-rebase.txt:127
#, priority:100
msgid "We want to make 'topic' forked from branch 'master'; for example, because the functionality on which 'topic' depends was merged into the more stable 'master' branch. We want our tree to look like this:"
-msgstr ""
+msgstr "�묇뺄�녘� 'topic' 餓롥늽�� 'master' 訝�늽�됧눣�ο폑堊뗥쫩竊뚦썱訝� 'topic' ��堊앲탺�꾢뒣�썲럴瀯뤷릦亮뜹댆雅녷쎍葉녑츣�꾢늽�� 'master' 訝��귝닊餓у툕�쎿닊餓х쉪�먧벡�묊쐦壅룡씎�뤺퓳�� :"
#. type: delimited block -
#: en/git-rebase.txt:134
@@ -42690,19 +42690,19 @@ msgid ""
" | o'--o'--o' topic\n"
" \\\n"
" o---o---o---o---o next\n"
-msgstr ""
+msgstr " o---o---o---o---o master\n | \\\n | o'--o'--o' topic\n \\\n o---o---o---o---o next\n"
#. type: Plain text
#: en/git-rebase.txt:137
#, priority:100
msgid "We can get this using the following command:"
-msgstr ""
+msgstr "�묇뺄��빳鵝욜뵪餓δ툔�썰빱�θ렩�� :"
#. type: Plain text
#: en/git-rebase.txt:139
#, no-wrap, priority:100
msgid " git rebase --onto master next topic\n"
-msgstr ""
+msgstr " git rebase --onto master next topic\n"
#. type: Plain text
#: en/git-rebase.txt:143
@@ -42730,7 +42730,7 @@ msgstr ""
#: en/git-rebase.txt:153 en/git-rebase.txt:176
#, priority:100
msgid "then the command"
-msgstr ""
+msgstr "�ｄ퉰�썰빱"
#. type: Plain text
#: en/git-rebase.txt:155
@@ -42742,7 +42742,7 @@ msgstr " git rebase --onto master topicA topicB\n"
#: en/git-rebase.txt:157
#, priority:100
msgid "would result in:"
-msgstr ""
+msgstr "弱녶��� :"
#. type: delimited block -
#: en/git-rebase.txt:164
@@ -42764,19 +42764,19 @@ msgstr ""
#: en/git-rebase.txt:167
#, priority:100
msgid "This is useful when topicB does not depend on topicA."
-msgstr ""
+msgstr "瓦쇿쑉訝삯쥦 B 訝띴풚壅뽨틢訝삯쥦 A �꾣깄�듕툔�욃만�됬뵪��"
#. type: Plain text
#: en/git-rebase.txt:170
#, priority:100
msgid "A range of commits could also be removed with rebase. If we have the following situation:"
-msgstr ""
+msgstr "阿잌룾餓η뵪�섇읃�좈솮訝�楹삣닓�먧벡�� 倻귝옖�묇뺄�뉐댆餓δ툔�끻넻 :"
#. type: delimited block -
#: en/git-rebase.txt:173
#, no-wrap, priority:100
msgid " E---F---G---H---I---J topicA\n"
-msgstr ""
+msgstr " E---F---G---H---I---J topicA\n"
#. type: Plain text
#: en/git-rebase.txt:178
@@ -42788,37 +42788,37 @@ msgstr " git rebase --onto topicA~5 topicA~3 topicA\n"
#: en/git-rebase.txt:180
#, priority:100
msgid "would result in the removal of commits F and G:"
-msgstr ""
+msgstr "弱녶��닷닠�� F �� G 窈뱄폏"
#. type: delimited block -
#: en/git-rebase.txt:183
#, no-wrap, priority:100
msgid " E---H'---I'---J' topicA\n"
-msgstr ""
+msgstr " E---H'---I'---J' topicA\n"
#. type: Plain text
#: en/git-rebase.txt:188
#, priority:100
msgid "This is useful if F and G were flawed in some way, or should not be part of topicA. Note that the argument to `--onto` and the `<upstream>` parameter can be any valid commit-ish."
-msgstr ""
+msgstr "倻귝옖 F �� G �ⓩ윇雅쎿뼶�€쐣煐븅쇃竊뚧닑�끺툖佯붻��� topicA �꾡��ⓨ늽竊뚩퓳訝��밧갚孃덃쐣�ⓦ�� 瑥룡낏�륅펽`--onto` �귝빊�� `<upstream>` �귝빊��빳��뻣鵝뺞쐣�덄쉪�먧벡��"
#. type: Plain text
#: en/git-rebase.txt:194
#, priority:100
msgid "In case of conflict, `git rebase` will stop at the first problematic commit and leave conflict markers in the tree. You can use `git diff` to locate the markers (<<<<<<) and make edits to resolve the conflict. For each file you edit, you need to tell Git that the conflict has been resolved, typically this would be done with"
-msgstr ""
+msgstr "倻귝옖�븀렟�꿰챳竊�`git rebase` 鴉싧쑉寧т�訝ゆ쐣��쥦�꾣룓雅ㅵ쨪�쒏�竊뚦뭉�ⓩ젒訝�븰訝뗥넳囹곫젃溫겹�� 鵝졾룾餓η뵪 `git diff` �얍댆瓦쇾틳�뉓� (<<<<<<)竊뚦뭉瓦쏂죱煐뽬풌餓θ㎗�녑넳囹곥�� 驪뤹폋渦묇�訝ゆ뻼餓띰펽�썽�誤곩몜瑥� Git �꿰챳藥꿱˙鰲ｅ넶竊뚪�싧만��빳��"
#. type: Plain text
#: en/git-rebase.txt:197
#, no-wrap, priority:100
msgid " git add <filename>\n"
-msgstr ""
+msgstr " git add <filename>\n"
#. type: Plain text
#: en/git-rebase.txt:201
#, priority:100
msgid "After resolving the conflict manually and updating the index with the desired resolution, you can continue the rebasing process with"
-msgstr ""
+msgstr "�뗥뒯鰲ｅ넶�꿰챳亮뜸빳�����꾢늽渦①럤�닸뼭榮℡폊�롳펽�ⓨ룾餓δ슴��"
#. type: Plain text
#: en/git-rebase.txt:204
@@ -42830,7 +42830,7 @@ msgstr " git rebase --continue\n"
#: en/git-rebase.txt:207
#, priority:100
msgid "Alternatively, you can undo the 'git rebase' with"
-msgstr ""
+msgstr "�뽬�낉펽�ⓧ튋��빳�싪퓝餓δ툔�방퀡�ㅹ� 'git rebase' �띴퐳"
#. type: Plain text
#: en/git-rebase.txt:210
@@ -42849,31 +42849,31 @@ msgstr "�됮」"
#: en/git-rebase.txt:216
#, priority:100
msgid "The options in this section cannot be used with any other option, including not with each other:"
-msgstr ""
+msgstr "�ц뒄訝�쉪�됮」訝띹꺗訝롣뻣鵝뺝끀餓뽭�됮」訝�壅룝슴�⑨펽�끾떖訝띹꺗�멧틨鵝욜뵪竊�"
#. type: Plain text
#: en/git-rebase.txt:219
#, priority:100
msgid "Restart the rebasing process after having resolved a merge conflict."
-msgstr ""
+msgstr "鰲ｅ넶�덂뭉�꿰챳�롳펽�띷뼭��뒯�띷뼭�녶뙷瓦쏁쮮��"
#. type: Plain text
#: en/git-rebase.txt:222
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
-msgstr ""
+msgstr "瓮녘퓝壤볟뎺烏δ툈竊뚪뇥�겼맦�③뇥�겼늽�븃퓵葉뗣��"
#. type: Plain text
#: en/git-rebase.txt:229
#, priority:100
msgid "Abort the rebase operation and reset HEAD to the original branch. If `<branch>` was provided when the rebase operation was started, then `HEAD` will be reset to `<branch>`. Otherwise `HEAD` will be reset to where it was when the rebase operation was started."
-msgstr ""
+msgstr "瀯덃��섇읃�띴퐳亮뜹컛 HEAD �띸쉰訝뷴렅冶뗥늽���귛쫩�쒎쑉��뒯�섇읃�띴퐳�뜻룓堊쎽틙 `<�녷뵱>`竊뚪궍阿� `HEAD` 弱녻˙�띸쉰訝� `<�녷뵱>`�귛맔�숋펽`HEAD` 弱녻˙�띸쉰訝뷴맦�ⓨ룜�뷸뱧鵝쒏뿶�꾡퐤營���"
#. type: Plain text
#: en/git-rebase.txt:235
#, priority:100
msgid "Abort the rebase operation but `HEAD` is not reset back to the original branch. The index and working tree are also left unchanged as a result. If a temporary stash entry was created using `--autostash`, it will be saved to the stash list."
-msgstr ""
+msgstr "�얍펱�섇읃�띴퐳竊뚥퐜 `HEAD` 訝띴폏�띸쉰�욃렅冶뗥늽���귞뇨凉뺝뭽藥δ퐳�묇튋鴉싧썱閭ㅴ퓷�곦툖�섅�귛쫩�쒍슴�� `--autostash` �쎾뻠雅녵릿�뜹궓�뤸씉��펽若껃컛熬ヤ퓷耶섇댆�②뿈�쀨〃訝���"
#. type: Labeled list
#: en/git-rebase.txt:236
@@ -42885,7 +42885,7 @@ msgstr "--edit-todo"
#: en/git-rebase.txt:238
#, priority:100
msgid "Edit the todo list during an interactive rebase."
-msgstr ""
+msgstr "�ⓧ벡雅믣폀�섇읃瓦뉒쮮訝�폋渦묈푷�욂틟窈밧닓烏ⓦ��"
#. type: Labeled list
#: en/git-rebase.txt:239
@@ -42897,7 +42897,7 @@ msgstr "--show-current-patch"
#: en/git-rebase.txt:243
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
-msgstr ""
+msgstr "�ⓧ벡雅믣폀�섇읃�뽩썱�꿰챳�뚦걶閭℡룜�뷸뿶�양ㅊ壤볟뎺烏δ툈�귞쎑壤볞틢 `git show REBASE_HEAD`��"
#. type: Labeled list
#: en/git-rebase.txt:246
@@ -42909,13 +42909,13 @@ msgstr "--onto <newbase>"
#: en/git-rebase.txt:251
#, priority:100
msgid "Starting point at which to create the new commits. If the `--onto` option is not specified, the starting point is `<upstream>`. May be any valid commit, and not just an existing branch name."
-msgstr ""
+msgstr "�쎾뻠�경룓雅ㅷ쉪壅루궧�귛쫩�쒏쑋�뉐츣 `--onto` �됮」竊뚦닕壅루궧訝� `<upstream>`�� ��빳��뻣鵝뺞쐣�덄쉪�먧벡竊뚩�뚥툖餓끺퍎��렟�됬쉪�녷뵱�띸㎞��"
#. type: Plain text
#: en/git-rebase.txt:255
#, ignore-ellipsis, priority:100
msgid "As a special case, you may use \"A\\...B\" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD."
-msgstr ""
+msgstr "鵝쒍맏訝�燁띸돶餘딀깄�듸펽倻귝옖 A �� B �꾢릦亮뜹틩�ゆ쐣訝�訝わ펽�쇿룾餓δ슴�� \"A\\...B \"鵝쒍맏�덂뭉佯볡쉪恙ユ뜼�밧폀�귝궓��鸚싧룾餓η쐛�� A �� B 訝�쉪訝�訝わ펽�②퓳燁띷깄�듕툔竊뚦츆容섋�訝� HEAD��"
#. type: Labeled list
#: en/git-rebase.txt:256
@@ -42927,43 +42927,43 @@ msgstr "--keep-base"
#: en/git-rebase.txt:262
#, ignore-ellipsis, priority:100
msgid "Set the starting point at which to create the new commits to the merge base of `<upstream>` and `<branch>`. Running `git rebase --keep-base <upstream> <branch>` is equivalent to running `git rebase --reapply-cherry-picks --no-fork-point --onto <upstream>...<branch> <upstream> <branch>`."
-msgstr ""
+msgstr "弱녶닗兩뷸뼭�먧벡�꾥돈�배�訝� `<upstream>` �� `<branch>` �꾢릦亮뜹틩�귟퓧烏� `git rebase --keep-base <upstream> <branch>` �멨퐪雅롨퓧烏� `git rebase --reapply-cherry-picks --no-fork-point --onto <upstream>...<branch> <upstream> <branch>` ��"
#. type: Plain text
#: en/git-rebase.txt:269
#, priority:100
msgid "This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is. As the base commit is unchanged this option implies `--reapply-cherry-picks` to avoid losing commits."
-msgstr ""
+msgstr "瑥ι�됮」�귞뵪雅롥쑉訝딀만�녷뵱訝듿��묈뒣�썹쉪�끻넻�귛쑉凉��묈뒣�썹쉪瓦뉒쮮訝�펽訝딀만�녷뵱��꺗鴉싧뎺瓦쏉펽瓦숁뿶��也썹쉪�욄퀡��꺗訝띷삸瀯㎫뺌�ⓧ툓歷멨늽��툓�띷뼭�좄슬竊뚩�뚧삸岳앮똻�뷸쑍�먧벡訝띶룜�귞뵳雅롥읃�ф룓雅ㅴ퓷�곦툖�섓펽瑥ι�됮」�뤷뫑�� `--reapply-cherry-picks`竊뚥빳�욕뀓訝℡ㅁ�먧벡��"
#. type: Plain text
#: en/git-rebase.txt:274
#, priority:100
msgid "Although both this option and `--fork-point` find the merge base between `<upstream>` and `<branch>`, this option uses the merge base as the _starting point_ on which new commits will be created, whereas `--fork-point` uses the merge base to determine the _set of commits_ which will be rebased."
-msgstr ""
+msgstr "�썹꽫瑥ι�됮」�� `-fork-point` �썼꺗�얍댆 `<upstream>` �� `<branch>` 阿뗩뿴�꾢릦亮뜹읃�곤펽鵝녻��됮」鵝욜뵪�덂뭉�뷸빊鵝쒍맏�쎾뻠�경룓雅ㅷ쉪_壅루궧_竊뚩�� `-fork-point`�쇾슴�ⓨ릦亮뜹읃�경씎簾�츣弱녻˙�띶츣�묊쉪_�먧벡��_��"
#. type: Plain text
#: en/git-rebase.txt:276 en/git-rebase.txt:291 en/git-rebase.txt:311 en/git-rebase.txt:332 en/git-rebase.txt:354 en/git-rebase.txt:362 en/git-rebase.txt:374 en/git-rebase.txt:386 en/git-rebase.txt:395 en/git-rebase.txt:437 en/git-rebase.txt:472 en/git-rebase.txt:497 en/git-rebase.txt:510 en/git-rebase.txt:517 en/git-rebase.txt:529 en/git-rebase.txt:582 en/git-rebase.txt:589 en/git-rebase.txt:609 en/git-rebase.txt:641
#, priority:100
msgid "See also INCOMPATIBLE OPTIONS below."
-msgstr ""
+msgstr "����귡쁾訝뗩씊�꾡툖�쇔��됮」��"
#. type: Plain text
#: en/git-rebase.txt:281
#, priority:100
msgid "Upstream branch to compare against. May be any valid commit, not just an existing branch name. Defaults to the configured upstream for the current branch."
-msgstr ""
+msgstr "誤곦툗阿뗦캈渦껆쉪訝딀만�녷뵱�� ��빳��뻣鵝뺞쐣�덄쉪�먧벡竊뚩�뚥툖餓끺퍎��렟�됬쉪�녷뵱�띸㎞�귡퍡溫ㅴ맏壤볟뎺�녷뵱�띸쉰�꾡툓歷멨늽����"
#. type: Plain text
#: en/git-rebase.txt:284
#, priority:100
msgid "Working branch; defaults to `HEAD`."
-msgstr ""
+msgstr "藥δ퐳�녷뵱竊쏃퍡溫ㅴ맏 `HEAD`��"
#. type: Plain text
#: en/git-rebase.txt:289
#, priority:100
msgid "Use applying strategies to rebase (calling `git-am` internally). This option may become a no-op in the future once the merge backend handles everything the apply one does."
-msgstr ""
+msgstr "鵝욜뵪佯붺뵪嶺뽫븼�ε룜�븝펷�낂깿瘟껆뵪 `git-am`竊됥�� 訝���릦亮뜹릮塋�쨪�녵틙佯붺뵪�롧ク���싩쉪訝��뉛펽瓦쇾릉�됮」弱녷씎��꺗弱긴툖�띺�귞뵪雅녴��"
#. type: Labeled list
#: en/git-rebase.txt:292
@@ -42975,13 +42975,13 @@ msgstr "--empty={drop,keep,ask}"
#: en/git-rebase.txt:303
#, priority:100
msgid "How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes). With drop (the default), commits that become empty are dropped. With keep, such commits are kept. With ask (implied by `--interactive`), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes. Other options, like `--exec`, will use the default of drop unless `-i`/`--interactive` is explicitly specified."
-msgstr ""
+msgstr "倻귚퐬鸚꾤릤凉�冶뗦뿶訝띷삸令븀쉪�먧벡竊뚥튋訝띷삸野밥툓歷멩룓雅ㅷ쉪瀛�껸�룟룚竊뚥퐜�③뇥�믣틣�롥룜訝븀㈉�꾣룓雅ㅿ펷�졽맏若껂뺄�끻맜雅녵툓歷멧엶�밭쉪耶먬썓竊됥�� 倻귝옖鵝욜뵪 drop竊덆퍡溫ㅿ펹竊뚦닕鴉싦륭凉껃룜訝븀㈉�꾣룓雅ㅳ�� 倻귝옖鵝욜뵪 keep竊뚦닕鴉싦퓷�숁�映삥룓雅ㅳ�� 倻귝옖鵝욜뵪 ask竊덆쉺�� `--interactive`竊됵펽壤볟틪�①㈉�먧벡�띰펽�섇읃�쒏�竊뚦뀅溫멧퐷�됪떓��륭凉껃츆�곭폋渦묉쎍鸚싨뻼餓띰펽瓦섉삸�ゆ룓雅ㅷ㈉�밧뒯�� �뜸퍟�됮」竊뚦쫩 `--exec`竊뚪솮�욄삇簾�뙁若싦틙 `-i`/`-interactive`竊뚦맔�쇿컛鵝욜뵪容섋��� drop��"
#. type: Plain text
#: en/git-rebase.txt:309
#, ignore-ellipsis, priority:100
msgid "Note that commits which start empty are kept (unless `--no-keep-empty` is specified), and commits which are clean cherry-picks (as determined by `git log --cherry-mark ...`) are detected and dropped as a preliminary step (unless `--reapply-cherry-picks` or `--keep-base` is passed)."
-msgstr ""
+msgstr "��誤곫낏�뤹쉪��펽凉�冶뗦뿶訝븀㈉�꾣룓雅ㅴ폏熬ヤ퓷�숋펷�ㅹ씆�뉐츣雅� `--no-keep-empty`竊됵펽�뚦묾���� cherry-picks �먧벡竊덄뵳 `git log --cherry-mark ...`竊됦폏熬ユ�役뗥댆亮뜸퐳訝븀К訝�閭θ˙訝℡펱竊덆솮�욇�싪퓝雅� `--reapply-cherry-picks`�� `--keep-base`竊됥��"
#. type: Plain text
#: en/git-rebase.txt:312 en/git-rebase.txt:661
@@ -42999,13 +42999,13 @@ msgstr "--keep-empty"
#: en/git-rebase.txt:321
#, priority:100
msgid "Do not keep commits that start empty before the rebase (i.e. that do not change anything from its parent) in the result. The default is to keep commits which start empty, since creating such commits requires passing the `--allow-empty` override flag to `git commit`, signifying that a user is very intentionally creating such a commit and thus wants to keep it."
-msgstr ""
+msgstr "訝띶쑉瀯볠옖訝�퓷�숅뇥營�뎺凉�冶뗤맏令븀쉪�먧벡竊덂뜵訝띷뵻�섊댍�먧벡�꾡뻣鵝뺝냵若뱄펹�� 容섋��끻넻訝뗤퓷�쇿�冶뗦뿶訝븀㈉�꾣룓雅ㅿ펽�졽맏�쎾뻠閭ㅷ굳�먧벡��誤곩릲 `git commit` 鴉좈�� `--allow-empty` 誤녺썣�뉐퓱竊뚩〃�롧뵪�룬씆躍멩쐣�뤷쑑�쎾뻠閭ㅷ굳�먧벡竊뚦썱閭ㅵ툕�쎽퓷�쇿츆��"
#. type: Plain text
#: en/git-rebase.txt:327
#, priority:100
msgid "Usage of this flag will probably be rare, since you can get rid of commits that start empty by just firing up an interactive rebase and removing the lines corresponding to the commits you don't want. This flag exists as a convenient shortcut, such as for cases where external tools generate many empty commits and you want them all removed."
-msgstr ""
+msgstr "鵝욜뵪瓦쇾릉�뉓��꾣깄�드룾�썲푽弱묕펽�졽맏鵝졾룵����뒯雅ㅴ틨凉뤷룜�븝펽亮뜹닠�ㅴ툗鵝졽툖�녘쫨�꾣룓雅ㅵ�佯붺쉪烏뚳펽弱김꺗�좈솮凉�冶뗦뿶訝븀㈉�꾣룓雅ㅳ�� 瑥ζ젃溫경삸訝�燁띷뼶堊욜쉪恙ユ뜼�밧폀竊뚧캈倻귛퐪鸚뽭깿藥ε끁�잍닇溫멨쩀令뷸룓雅ㅿ펽�뚥퐷躍뚧쐹弱녶츆餓у뀲�ⓨ닠�ㅶ뿶��"
#. type: Plain text
#: en/git-rebase.txt:330
diff --git a/po/documentation.zh_HANT.po b/po/documentation.zh_HANT.po
index 95bac0a6f504b39804698ca03158e96c4b0dbeac..8dea26911dc21644a525fe91fc3be7dd880ab462 100644
--- a/po/documentation.zh_HANT.po
+++ b/po/documentation.zh_HANT.po
@@ -2,7 +2,7 @@
# Copyright (C) 2019
# This file is distributed under the same license as the Git package.
msgid ""
-msgstr "Project-Id-Version: Git Documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-05-18 19:52+0200\nPO-Revision-Date: 2023-07-29 13:56+0000\nLast-Translator: Haowei Hsu <hwhsu1231@gmail.com>\nLanguage-Team: French\nLanguage: zh_HANT\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 5.0-dev\n"
+msgstr "Project-Id-Version: Git Documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-05-18 19:52+0200\nPO-Revision-Date: 2023-07-31 17:04+0000\nLast-Translator: Haowei Hsu <hwhsu1231@gmail.com>\nLanguage-Team: French\nLanguage: zh_HANT\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 5.0-dev\n"
#. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:769 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:146 en/git-status.txt:31
@@ -6695,7 +6695,7 @@ msgstr ""
#: en/git-add.txt:195 en/git-update-index.txt:85
#, no-wrap, priority:300
msgid "--chmod=(+|-)x"
-msgstr ""
+msgstr "--chmod=(+|-)x"
#. type: Plain text
#: en/git-add.txt:199
@@ -11551,7 +11551,7 @@ msgstr ""
#: en/git-cat-file.txt:150
#, no-wrap, priority:80
msgid "info <object>"
-msgstr ""
+msgstr "info <object>"
#. type: Plain text
#: en/git-cat-file.txt:153
@@ -11563,7 +11563,7 @@ msgstr ""
#: en/git-cat-file.txt:154
#, no-wrap, priority:80
msgid "flush"
-msgstr ""
+msgstr "flush"
#. type: Plain text
#: en/git-cat-file.txt:159
@@ -14949,13 +14949,13 @@ msgstr ""
#: en/git-clone.txt:203
#, no-wrap, priority:300
msgid "-o <name>"
-msgstr ""
+msgstr "-o <name>"
#. type: Labeled list
#: en/git-clone.txt:204
#, no-wrap, priority:300
msgid "--origin <name>"
-msgstr ""
+msgstr "--origin <name>"
#. type: Plain text
#: en/git-clone.txt:208
@@ -16100,7 +16100,7 @@ msgstr ""
#: en/git-commit.txt:335 en/git-status.txt:58
#, no-wrap, priority:280
msgid "-u[<mode>]"
-msgstr ""
+msgstr "-u[<mode>]"
#. type: Labeled list
#: en/git-commit.txt:336 en/git-status.txt:59
@@ -16124,7 +16124,7 @@ msgstr ""
#: en/git-commit.txt:345 en/git-status.txt:68 en/git-status.txt:110
#, priority:280
msgid "The possible options are:"
-msgstr ""
+msgstr "��꺗�꾦겦�끾쐣竊�"
#. type: Plain text
#: en/git-commit.txt:347
@@ -24362,7 +24362,7 @@ msgstr "git-fetch(1)"
#: en/git-fetch.txt:7
#, priority:220
msgid "git-fetch - Download objects and refs from another repository"
-msgstr ""
+msgstr "git-fetch - 孃욃룱訝��뗥꽧耶섇벴訝뗨펹�⒳뻑�뚦룂��"
#. type: Plain text
#: en/git-fetch.txt:16
@@ -30257,7 +30257,7 @@ msgstr ""
#: en/git-http-fetch.txt:13
#, no-wrap, priority:100
msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
-msgstr ""
+msgstr "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n"
#. type: Plain text
#: en/git-http-fetch.txt:17
@@ -30980,7 +30980,7 @@ msgstr "git-init(1)"
#: en/git-init.txt:7
#, priority:300
msgid "git-init - Create an empty Git repository or reinitialize an existing one"
-msgstr "git-init -�드뻠訝��뗧㈉�껯it�됧꽧�뽪삸�띷뼭�앭쭓�뽩럴耶섇쑉�꾢�됧꽧"
+msgstr "git-init - 兩븀쳦訝��뗧㈉�� Git �꿨춼佯ユ닑��뇥�겼닜冶뗥뙑�얏쐣�꾢꽧耶섇벴"
#. type: Plain text
#: en/git-init.txt:16
@@ -31012,7 +31012,7 @@ msgstr "�숃죱�뉏빱�껃돲兩뷰��뗧㈉�껯it�됧꽧竊뚦읃�т툓����뗥릫��`.g
#: en/git-init.txt:29
#, priority:300
msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository."
-msgstr "倻귝옖�됭Þ若싩뮥罌껇츏��`$GIT_DIR`竊뚦뎴�껂슴�②˙�뉐츣�꾥러孃묕펽�뚥툖��`./.git`堊녶뻠塋뗥�됧꽧�꾢읃鹽롦첇旅덀��"
+msgstr "�ζ쐣鼇�츣�겼쥊溫딀빖 `$GIT_DIR`竊뚦뎴�껂슴�②˙�뉐츣�꾥러孃묕펽�뚥툖�� `./.git` 堊녶뻠塋뗥꽧耶섇벴�꾢읃佯뺞첇旅덀��"
#. type: Plain text
#: en/git-init.txt:34
@@ -31024,7 +31024,7 @@ msgstr "倻귝옖object�꿨춼瓮�풌�됬텚�긺뮥罌껇츏��`$GIT_OBJECT_DIRECTORY`��
#: en/git-init.txt:39
#, priority:300
msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
-msgstr "�①뤎�됬쉪�됧꽧�룩죱'git init'��푽若됧뀲�꾠�귛츆訝╊툖�껇쫮�뗦럦藥꿨춼�①쉪茹붹죭�귡뇥�겼윿烏�'git init'��訝삭쫨�꾢렅�좑펽��렮�뽩풓�겼쥭�꾣Æ�욘첇旅�(�뽪삸�졽툓 --separate-git-dir 弱뉐�됧꽧燁삣댆�╊��뗤퐤營�)��"
+msgstr "�①뤎�됬쉪�꿨춼佯ヤ릎�룩죱 'git init' ��푽若됧뀲�꾠�귛츆訝╊툖�껇쫮�뗦럦�얏쐣�꾣첇旅덀�귡뇥�겼윿烏� 'git init' ��訝삭쫨�꾢렅�좑펽��렮�뽩풓�겼쥭�꾣Æ�욘첇旅�(\n�뽪삸�졽툓 --separate-git-dir 弱뉐꽧耶섇벴燁삣댆�╊��뗤퐤營�펹��"
#. type: Plain text
#: en/git-init.txt:47
@@ -31036,7 +31036,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
@@ -31048,7 +31048,7 @@ msgstr "--object-format=<�쇔폀>"
#: en/git-init.txt:57
#, priority:300
msgid "Specify the given object format (hash algorithm) for the repository. The valid values are 'sha1' and (if enabled) 'sha256'. 'sha1' is the default."
-msgstr "�뉐츣�됧벴�꾤돥餓뜻졏凉�(�쒏퉲轢붺츞力�)�귛룾餓ζ뙁若싩궨'sha1'�뽪삸'sha256'(�됧븶�①쉪屋�)�귡젏鼇��쇘궨'sha1'��"
+msgstr "�뉐츣�꿨춼佯ョ쉪永�츣�⒳뻑�쇔폀竊덆썫疫딀폇嶸쀦퀡竊됥�귝쐣�덂�쇘궨 'sha1' �뽪삸 'sha256' 竊덃쐣�잏뵪�꾥㈀竊됥�귡젏鼇��쇘궨 'sha1'��"
#. type: Plain text
#: en/git-init.txt:64
@@ -34327,7 +34327,7 @@ msgstr ""
#: en/git-merge-file.txt:66
#, priority:90
msgid "Send results to standard output instead of overwriting `<current-file>`."
-msgstr ""
+msgstr "�녜�곭탳�쒑눛與숁틬雍멨눣竊뚩�뚥툖��쫮野� `<current-file>`��"
#. type: Plain text
#: en/git-merge-file.txt:69
@@ -35775,7 +35775,7 @@ msgstr ""
#: en/git-merge.txt:388
#, no-wrap, priority:240
msgid "branch.<name>.mergeOptions"
-msgstr ""
+msgstr "branch.<name>.mergeOptions"
#. type: Plain text
#: en/git-merge.txt:392
@@ -36210,7 +36210,7 @@ msgid ""
"'git notes' remove [--ignore-missing] [--stdin] [<object>...]\n"
"'git notes' prune [-n] [-v]\n"
"'git notes' get-ref\n"
-msgstr ""
+msgstr "'git notes' [list [<object>]]\n'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n'git notes' copy [-f] ( --stdin | <from-object> [<to-object>] )\n'git notes' append [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n'git notes' edit [--allow-empty] [<object>]\n'git notes' show [<object>]\n'git notes' merge [-v | -q] [-s <strategy> ] <notes-ref>\n'git notes' merge --commit [-v | -q]\n'git notes' merge --abort [-v | -q]\n'git notes' remove [--ignore-missing] [--stdin] [<object>...]\n'git notes' prune [-n] [-v]\n'git notes' get-ref\n"
#. type: Plain text
#: en/git-notes.txt:29
@@ -36717,7 +36717,7 @@ msgstr "git-p4(1)"
#: en/git-p4.txt:7
#, priority:90
msgid "git-p4 - Import from and submit to Perforce repositories"
-msgstr ""
+msgstr "git-p4 - 孃� Perforce �꿨춼佯ュ뙬�ε뭽�먧벡�� Perforce �꿨춼佯ャ��"
#. type: Plain text
#: en/git-p4.txt:16
@@ -36796,7 +36796,7 @@ msgstr ""
#: en/git-p4.txt:66
#, no-wrap, priority:90
msgid "Clone"
-msgstr ""
+msgstr "Clone"
#. type: Plain text
#: en/git-p4.txt:69
@@ -36844,7 +36844,7 @@ msgstr ""
#: en/git-p4.txt:89
#, no-wrap, priority:90
msgid "Sync"
-msgstr ""
+msgstr "Sync"
#. type: Plain text
#: en/git-p4.txt:92
@@ -36856,7 +36856,7 @@ msgstr ""
#: en/git-p4.txt:94
#, no-wrap, priority:90
msgid "$ git p4 sync\n"
-msgstr ""
+msgstr "$ git p4 sync\n"
#. type: Plain text
#: en/git-p4.txt:96
@@ -36878,7 +36878,7 @@ msgid ""
"$ cd repo-git\n"
"$ git init\n"
"$ git p4 sync //path/in/your/perforce/depot\n"
-msgstr ""
+msgstr "$ mkdir repo-git\n$ cd repo-git\n$ git init\n$ git p4 sync //path/in/your/perforce/depot\n"
#. type: Plain text
#: en/git-p4.txt:109
@@ -36902,7 +36902,7 @@ msgstr ""
#: en/git-p4.txt:122
#, no-wrap, priority:90
msgid "Rebase"
-msgstr ""
+msgstr "�띶츣�뷴틫"
#. type: Plain text
#: en/git-p4.txt:128
@@ -36914,7 +36914,7 @@ msgstr ""
#: en/git-p4.txt:134
#, no-wrap, priority:90
msgid "Submit"
-msgstr ""
+msgstr "�먧벡"
#. type: Plain text
#: en/git-p4.txt:140
@@ -36952,7 +36952,7 @@ msgstr ""
msgid ""
"$ git p4 submit --commit <sha1>\n"
"$ git p4 submit --commit <sha1..sha1>\n"
-msgstr ""
+msgstr "$ git p4 submit --commit <sha1>\n$ git p4 submit --commit <sha1..sha1>\n"
#. type: Plain text
#: en/git-p4.txt:160
@@ -37026,7 +37026,7 @@ msgstr ""
#: en/git-p4.txt:202
#, no-wrap, priority:90
msgid "General options"
-msgstr ""
+msgstr "訝��ч겦��"
#. type: Plain text
#: en/git-p4.txt:204
@@ -37056,7 +37056,7 @@ msgstr ""
#: en/git-p4.txt:213
#, no-wrap, priority:90
msgid "Sync options"
-msgstr ""
+msgstr "�뚧��면쟿"
#. type: Plain text
#: en/git-p4.txt:216
@@ -37238,7 +37238,7 @@ msgstr ""
#: en/git-p4.txt:296
#, no-wrap, priority:90
msgid "Clone options"
-msgstr ""
+msgstr "Clone �면쟿"
#. type: Plain text
#: en/git-p4.txt:299
@@ -37268,7 +37268,7 @@ msgstr ""
#: en/git-p4.txt:309
#, no-wrap, priority:90
msgid "Submit options"
-msgstr ""
+msgstr "�먧벡�면쟿"
#. type: Plain text
#: en/git-p4.txt:311
@@ -37430,7 +37430,7 @@ msgstr ""
#: en/git-p4.txt:381
#, no-wrap, priority:90
msgid "p4-pre-submit"
-msgstr ""
+msgstr "p4-pre-submit"
#. type: Plain text
#: en/git-p4.txt:387
@@ -37446,10 +37446,9 @@ msgstr ""
#. type: Title ~
#: en/git-p4.txt:391
-#, fuzzy, no-wrap, priority:90
-#| msgid "--ignore-space-change"
+#, no-wrap, priority:90
msgid "p4-prepare-changelist"
-msgstr "--ignore-space-change"
+msgstr "p4-prepare-changelist"
#. type: Plain text
#: en/git-p4.txt:398
@@ -37465,10 +37464,9 @@ msgstr ""
#. type: Title ~
#: en/git-p4.txt:404
-#, fuzzy, no-wrap, priority:90
-#| msgid "`changes`"
+#, no-wrap, priority:90
msgid "p4-changelist"
-msgstr "`changes`"
+msgstr "p4-changelist"
#. type: Plain text
#: en/git-p4.txt:411
@@ -37498,7 +37496,7 @@ msgstr ""
#: en/git-p4.txt:427
#, no-wrap, priority:90
msgid "Rebase options"
-msgstr ""
+msgstr "Rebase �면쟿"
#. type: Plain text
#: en/git-p4.txt:429
@@ -37510,13 +37508,13 @@ msgstr ""
#: en/git-p4.txt:432
#, priority:90
msgid "Import p4 labels."
-msgstr ""
+msgstr "��뀯 p4 與숂광��"
#. type: Title ~
#: en/git-p4.txt:434
#, no-wrap, priority:90
msgid "Unshelve options"
-msgstr ""
+msgstr "Unshelve �면쟿"
#. type: Labeled list
#: en/git-p4.txt:436
@@ -38208,7 +38206,7 @@ msgstr ""
#: en/git-p4.txt:785
#, no-wrap, priority:90
msgid "git-p4.disableP4Sync"
-msgstr ""
+msgstr "git-p4.disableP4Sync"
#. type: Plain text
#: en/git-p4.txt:787
@@ -43646,7 +43644,7 @@ msgstr "--git-dir"
#: en/git-receive-pack.txt:43
#, priority:90
msgid "The repository to sync into."
-msgstr ""
+msgstr "誤곩릪閭η쉪�꿨춼佯ャ��"
#. type: Labeled list
#: en/git-receive-pack.txt:44 en/git-upload-pack.txt:39
@@ -48150,7 +48148,7 @@ msgstr "git-rm(1)"
#: en/git-rm.txt:7
#, priority:280
msgid "git-rm - Remove files from the working tree and from the index"
-msgstr ""
+msgstr "git-rm - 孃욃램鵝쒏㉨�뚨뇨凉뺜릎燁삯솮茹붹죭"
#. type: Plain text
#: en/git-rm.txt:14
@@ -54482,13 +54480,13 @@ msgstr ""
#: en/git-svn.txt:791
#, no-wrap, priority:100
msgid "svn.useSvnsyncProps"
-msgstr ""
+msgstr "svn.useSvnsyncProps"
#. type: Labeled list
#: en/git-svn.txt:792
#, no-wrap, priority:100
msgid "svn-remote.<name>.useSvnsyncprops"
-msgstr ""
+msgstr "svn-remote.<name>.useSvnsyncprops"
#. type: Plain text
#: en/git-svn.txt:796
@@ -56370,7 +56368,7 @@ msgstr ""
#: en/git.txt:311
#, no-wrap, priority:100
msgid "Syncing repositories"
-msgstr ""
+msgstr "�뚧��꿨춼佯�"
#. type: Plain text
#: en/git.txt:317
@@ -56581,7 +56579,7 @@ msgstr ""
#: en/git.txt:441
#, priority:100
msgid "Please see the linkgit:gitrepository-layout[5] document."
-msgstr ""
+msgstr "獄뗥룂誤� linkgit:gitrepository-layout[5] �뉏뻑��"
#. type: Plain text
#: en/git.txt:443
@@ -56605,7 +56603,7 @@ msgstr ""
#: en/git.txt:451
#, priority:100
msgid "Please see linkgit:gitglossary[7]."
-msgstr ""
+msgstr "獄뗥룂誤� linkgit:gitglossary[7]��"
#. type: Plain text
#: en/git.txt:459
@@ -56623,7 +56621,7 @@ msgstr ""
#: en/git.txt:463
#, no-wrap, priority:100
msgid "The Git Repository"
-msgstr ""
+msgstr "Git �꿨춼佯�"
#. type: Plain text
#: en/git.txt:467
@@ -57683,7 +57681,7 @@ msgstr ""
#: en/git.txt:1053
#, no-wrap, priority:100
msgid "Authors"
-msgstr ""
+msgstr "鵝쒑��"
#. type: Plain text
#: en/git.txt:1058
@@ -57701,7 +57699,7 @@ msgstr ""
#: en/git.txt:1064
#, no-wrap, priority:100
msgid "Reporting Bugs"
-msgstr ""
+msgstr "�욃젿��윸"
#. type: Plain text
#: en/git.txt:1071
@@ -59196,7 +59194,7 @@ msgstr ""
#: en/git-upload-pack.txt:49
#, priority:100
msgid "The repository to sync from."
-msgstr ""
+msgstr "誤곩풛訝�릪閭η쉪�꿨춼佯ャ��"
#. type: Plain text
#: en/git-upload-pack.txt:57
@@ -60577,7 +60575,7 @@ msgstr "gitglossary(7)"
#: en/gitglossary.txt:7
#, priority:310
msgid "gitglossary - A Git Glossary"
-msgstr ""
+msgstr "gitglossary - Git 屋욃퐰烏�"
#. type: Plain text
#: en/gitglossary.txt:11
@@ -60608,7 +60606,7 @@ msgstr ""
#: en/glossary-content.txt:6
#, no-wrap, priority:310
msgid "[[def_bare_repository]]bare repository"
-msgstr ""
+msgstr "[[def_bare_repository]]獒멨꽧耶섇벴竊늒are repository竊�"
#. type: Plain text
#: en/glossary-content.txt:16
@@ -60632,7 +60630,7 @@ msgstr ""
#: en/glossary-content.txt:20
#, no-wrap, priority:310
msgid "[[def_branch]]branch"
-msgstr ""
+msgstr "[[def_branch]]�녷뵱竊늒ranch竊�"
#. type: Plain text
#: en/glossary-content.txt:30
@@ -60644,7 +60642,7 @@ msgstr ""
#: en/glossary-content.txt:31
#, no-wrap, priority:310
msgid "[[def_cache]]cache"
-msgstr ""
+msgstr "[[def_cache]]恙ュ룚竊늓ache竊�"
#. type: Plain text
#: en/glossary-content.txt:33
@@ -60782,7 +60780,7 @@ msgstr ""
#: en/glossary-content.txt:112
#, no-wrap, priority:310
msgid "[[def_core_git]]core Git"
-msgstr ""
+msgstr "[[def_core_git]]�멨퓘 Git竊늓ore Git竊�"
#. type: Plain text
#: en/glossary-content.txt:115
@@ -60836,7 +60834,7 @@ msgstr ""
#: en/glossary-content.txt:147
#, no-wrap, priority:310
msgid "[[def_directory]]directory"
-msgstr ""
+msgstr "[[def_directory]]��똾竊늕irectory竊�"
#. type: Plain text
#: en/glossary-content.txt:149
@@ -60884,7 +60882,7 @@ msgstr ""
#: en/glossary-content.txt:169
#, no-wrap, priority:310
msgid "[[def_fetch]]fetch"
-msgstr ""
+msgstr "[[def_fetch]]�룟룚竊늗etch竊�"
#. type: Plain text
#: en/glossary-content.txt:175
@@ -60896,7 +60894,7 @@ msgstr ""
#: en/glossary-content.txt:176
#, no-wrap, priority:310
msgid "[[def_file_system]]file system"
-msgstr ""
+msgstr "[[def_file_system]]茹붹죭楹사뎠竊늗ile system竊�"
#. type: Plain text
#: en/glossary-content.txt:180
@@ -61010,7 +61008,7 @@ msgstr ""
#: en/glossary-content.txt:229
#, no-wrap, priority:310
msgid "[[def_index]]index"
-msgstr ""
+msgstr "[[def_index]]榮℡폊竊늝ndex竊�"
#. type: Plain text
#: en/glossary-content.txt:235
@@ -61022,7 +61020,7 @@ msgstr ""
#: en/glossary-content.txt:236
#, no-wrap, priority:310
msgid "[[def_index_entry]]index entry"
-msgstr ""
+msgstr "[[def_index_entry]]榮℡폊歟앯쎅竊늝ndex entry竊�"
#. type: Plain text
#: en/glossary-content.txt:241
@@ -61046,7 +61044,7 @@ msgstr ""
#: en/glossary-content.txt:249
#, no-wrap, priority:310
msgid "[[def_merge]]merge"
-msgstr ""
+msgstr "[[def_merge]]�덁슉竊늤erge竊�"
#. type: Plain text
#: en/glossary-content.txt:262
@@ -61064,7 +61062,7 @@ msgstr ""
#: en/glossary-content.txt:270
#, no-wrap, priority:310
msgid "[[def_object]]object"
-msgstr ""
+msgstr "[[def_object]]�⒳뻑竊늨bject竊�"
#. type: Plain text
#: en/glossary-content.txt:274
@@ -61076,7 +61074,7 @@ msgstr ""
#: en/glossary-content.txt:275
#, no-wrap, priority:310
msgid "[[def_object_database]]object database"
-msgstr ""
+msgstr "[[def_object_database]]�⒳뻑蘊뉑뼑佯ワ펷object database竊�"
#. type: Plain text
#: en/glossary-content.txt:279
@@ -61100,7 +61098,7 @@ msgstr ""
#: en/glossary-content.txt:283
#, no-wrap, priority:310
msgid "[[def_object_name]]object name"
-msgstr ""
+msgstr "[[def_object_name]]�⒳뻑�띸㉠竊늨bject name竊�"
#. type: Plain text
#: en/glossary-content.txt:287
@@ -61112,7 +61110,7 @@ msgstr ""
#: en/glossary-content.txt:288
#, no-wrap, priority:310
msgid "[[def_object_type]]object type"
-msgstr ""
+msgstr "[[def_object_type]]�⒳뻑�뗥닪竊늨bject type竊�"
#. type: Plain text
#: en/glossary-content.txt:293
@@ -61464,7 +61462,7 @@ msgstr ""
#: en/glossary-content.txt:485
#, no-wrap, priority:310
msgid "[[def_pull]]pull"
-msgstr ""
+msgstr "[[def_pull]]�됧룚竊늩ull竊�"
#. type: Plain text
#: en/glossary-content.txt:488
@@ -61476,7 +61474,7 @@ msgstr ""
#: en/glossary-content.txt:489
#, no-wrap, priority:310
msgid "[[def_push]]push"
-msgstr ""
+msgstr "[[def_push]]�③�곻펷push竊�"
#. type: Plain text
#: en/glossary-content.txt:500
@@ -61512,7 +61510,7 @@ msgstr ""
#: en/glossary-content.txt:519
#, no-wrap, priority:310
msgid "[[def_rebase]]rebase"
-msgstr ""
+msgstr "[[def_rebase]]�띶츣�뷴틫竊늭ebase竊�"
#. type: Plain text
#: en/glossary-content.txt:523
@@ -61572,7 +61570,7 @@ msgstr ""
#: en/glossary-content.txt:551
#, no-wrap, priority:310
msgid "[[def_remote]]remote repository"
-msgstr ""
+msgstr "[[def_remote]]�좂ク�꿨춼佯ワ펷remote repository竊�"
#. type: Plain text
#: en/glossary-content.txt:555
@@ -61596,7 +61594,7 @@ msgstr ""
#: en/glossary-content.txt:565
#, no-wrap, priority:310
msgid "[[def_repository]]repository"
-msgstr ""
+msgstr "[[def_repository]]�꿨춼佯ワ펷repository竊�"
#. type: Plain text
#: en/glossary-content.txt:572
@@ -61740,7 +61738,7 @@ msgstr ""
#: en/glossary-content.txt:630
#, no-wrap, priority:310
msgid "[[def_tag]]tag"
-msgstr ""
+msgstr "[[def_tag]]與숃쮼竊늯ag竊�"
#. type: Plain text
#: en/glossary-content.txt:639
@@ -61836,7 +61834,7 @@ msgstr ""
#: en/glossary-content.txt:685
#, no-wrap, priority:310
msgid "[[def_upstream_branch]]upstream branch"
-msgstr ""
+msgstr "[[def_upstream_branch]]訝딀만�녷뵱竊늱pstream branch竊�"
#. type: Plain text
#: en/glossary-content.txt:690
@@ -62267,7 +62265,7 @@ msgstr ""
#: en/merge-strategies.txt:2
#, no-wrap, priority:240
msgid "MERGE STRATEGIES"
-msgstr ""
+msgstr "�덁슉嶺뽫븼"
#. type: Plain text
#: en/merge-strategies.txt:8