Skip to content
Snippets Groups Projects
Commit 20fb0ae5 authored by Jean-Noël Avila's avatar Jean-Noël Avila
Browse files

Merge remote-tracking branch 'weblate/master'

parents 31f4fd36 e557d3cb
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
po/documentation.de.po
+ 48
− 27
View file @ 20fb0ae5
...@@ -11,8 +11,8 @@ msgstr "" ...@@ -11,8 +11,8 @@ msgstr ""
"Project-Id-Version: git documentation\n" "Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
"POT-Creation-Date: 2020-05-16 17:29+0200\n" "POT-Creation-Date: 2020-05-16 17:29+0200\n"
"PO-Revision-Date: 2020-05-14 20:41+0000\n" "PO-Revision-Date: 2020-05-17 08:27+0000\n"
"Last-Translator: Dieter Ziller <max123kl@ziller.de>\n" "Last-Translator: Anonymous <noreply@weblate.org>\n"
"Language-Team: Matthias Aßhauer <mha1993@live.de>\n" "Language-Team: Matthias Aßhauer <mha1993@live.de>\n"
"Language: de\n" "Language: de\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
...@@ -2801,10 +2801,13 @@ msgstr "ISO 8601" ...@@ -2801,10 +2801,13 @@ msgstr "ISO 8601"
   
#. type: Plain text #. type: Plain text
#: en/date-formats.txt:26 #: en/date-formats.txt:26
#, fuzzy, priority:280 #, priority:280
#| msgid "Time and date specified by the ISO 8601 standard, for example `2005-04-07T22:13:13`. The parser accepts a space instead of the `T` character as well."
msgid "Time and date specified by the ISO 8601 standard, for example `2005-04-07T22:13:13`. The parser accepts a space instead of the `T` character as well. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`" msgid "Time and date specified by the ISO 8601 standard, for example `2005-04-07T22:13:13`. The parser accepts a space instead of the `T` character as well. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`"
msgstr "Datum und Uhrzeit, wie sie im ISO-Standard 8601 definiert sind. Zum Beispiel `2005-04-07T22:13:13`. Der Parser akzeptiert auch ein Leerzeichen statt dem `T`." msgstr ""
"Datum und Uhrzeit, wie sie im ISO-Standard 8601 definiert sind. Zum Beispiel "
"`2005-04-07T22:13:13`. Der Parser akzeptiert auch ein Leerzeichen statt dem "
"`T`. Sekundenbruchteile werden ignoriert, zum Beispiel wird "
"`2005-04-07T22:13:13.019` als `2005-04-07T22:13:13` behandelt."
   
#. type: Plain text #. type: Plain text
#: en/date-formats.txt:29 #: en/date-formats.txt:29
...@@ -4839,6 +4842,9 @@ msgstr "-F <file>" ...@@ -4839,6 +4842,9 @@ msgstr "-F <file>"
#, priority:280 #, priority:280
msgid "Control the order in which files appear in the output. This overrides the `diff.orderFile` configuration variable (see linkgit:git-config[1]). To cancel `diff.orderFile`, use `-O/dev/null`." msgid "Control the order in which files appear in the output. This overrides the `diff.orderFile` configuration variable (see linkgit:git-config[1]). To cancel `diff.orderFile`, use `-O/dev/null`."
msgstr "" msgstr ""
"Steuert die Reihenfolge der Dateien in der Ausgabe. Dies setzt die "
"Konfigurations-Variable `diff.orderFile` außer Kraft (siehe linkgit:git-"
"config[1]). Um `diff.orderFile` zu stornieren, benutzen Sie `-O/dev/null`."
   
#. type: Plain text #. type: Plain text
#: en/diff-options.txt:622 #: en/diff-options.txt:622
...@@ -5632,7 +5638,13 @@ msgstr "--server-option=<Option>" ...@@ -5632,7 +5638,13 @@ msgstr "--server-option=<Option>"
#: en/fetch-options.txt:251 en/git-clone.txt:143 #: en/fetch-options.txt:251 en/git-clone.txt:143
#, priority:300 #, priority:300
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server's handling of server options, including unknown ones, is server-specific. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line." msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server's handling of server options, including unknown ones, is server-specific. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr "Übertragen Sie die angegebene Zeichenfolge an den Server, wenn Sie mit Protokollversion 2 arbeiten. Die übergebene Zeichenfolge darf kein NUL- oder LF-Zeichen enthalten. Die Verarbeitung von Server-Optionen, einschließlich unbekannter Optionen, durch den Server ist serverspezifisch. Wenn mehrere `--server-option=<option>` übergeben werden, werden sie alle, nacheinander, wie in der Befehlszeile angegeben, an die andere Seite gesendet." msgstr ""
"Übertragen Sie die angegebene Zeichenfolge an den Server, wenn Sie mit "
"Protokollversion 2 kommunizieren. Die angegebene Zeichenfolge darf kein NUL-"
" oder LF-Zeichen enthalten. Die Behandlung von Server-Optionen, "
"einschließlich unbekannter, durch den Server ist serverspezifisch. Wenn "
"mehrere `--server-option=<option>` angegeben werden, werden sie alle in der "
"in der Befehlszeile angegebenen Reihenfolge an die andere Seite gesendet."
   
#. type: Labeled list #. type: Labeled list
#: en/fetch-options.txt:252 #: en/fetch-options.txt:252
...@@ -12449,10 +12461,10 @@ msgstr "$ git checkout mytopic\n" ...@@ -12449,10 +12461,10 @@ msgstr "$ git checkout mytopic\n"
msgid "However, your \"wrong\" branch and correct `mytopic` branch may differ in files that you have modified locally, in which case the above checkout would fail like this:" msgid "However, your \"wrong\" branch and correct `mytopic` branch may differ in files that you have modified locally, in which case the above checkout would fail like this:"
msgstr "Der \"falsche\" Branch und der korrekte Branch \"mytopic\" können sich in lokal geänderten Dateien unterscheiden, was daz führt, dass der obige Checkout folgendermaßen fehlschlägt:" msgstr "Der \"falsche\" Branch und der korrekte Branch \"mytopic\" können sich in lokal geänderten Dateien unterscheiden, was daz führt, dass der obige Checkout folgendermaßen fehlschlägt:"
   
#. type: delimited block -
# git-checkout.txt is not up to date. The fuzzy msgid is the message prior to 142183d0 2010-07-09 "checkout: accord documentation to what git does", the msgid is the message in the documentation afterwards. # git-checkout.txt is not up to date. The fuzzy msgid is the message prior to 142183d0 2010-07-09 "checkout: accord documentation to what git does", the msgid is the message in the documentation afterwards.
# At that time there weren't even po files in the git tree. This message does not exist since 23cbf11b 2010-08-11 "merge-recursive: porcelain messages for checkout". # At that time there weren't even po files in the git tree. This message does not exist since 23cbf11b 2010-08-11 "merge-recursive: porcelain messages for checkout".
# The current message is "Your local changes to the following files would be overwritten by merge:\n%%s" as of 2e3926b9 2016-05-13 "i18n: unpack-trees: avoid substituting only a verb in sentences" # The current message is "Your local changes to the following files would be overwritten by merge:\n%%s" as of 2e3926b9 2016-05-13 "i18n: unpack-trees: avoid substituting only a verb in sentences"
#. type: delimited block -
#: en/git-checkout.txt:561 #: en/git-checkout.txt:561
#, fuzzy, no-wrap, priority:240 #, fuzzy, no-wrap, priority:240
#| msgid "" #| msgid ""
...@@ -13615,8 +13627,10 @@ msgstr "" ...@@ -13615,8 +13627,10 @@ msgstr ""
"\t [-o <Name>] [-b <Name>] [-u <Upload-Pack>] [--reference <Repository>]\n" "\t [-o <Name>] [-b <Name>] [-u <Upload-Pack>] [--reference <Repository>]\n"
"\t [--dissociate] [--separate-git-dir <Git-Verzeichnis>]\n" "\t [--dissociate] [--separate-git-dir <Git-Verzeichnis>]\n"
"\t [--depth <depth>] [--[no-]single-branch] [--no-tags]\n" "\t [--depth <depth>] [--[no-]single-branch] [--no-tags]\n"
"\t [--recurse-submodules[=<Pfad-Spezifikation>]] [--[no-]shallow-submodules]\n" "\t [--recurse-submodules[=<Pfad-Spezifikation>]] [--[no-]shallow-submodules]"
"\t [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--] <Repository>\n" "\n"
"\t [--[no-]remote-submodules] [--jobs <n>] [--sparse]\n"
"\t [--filter=<filter>] [--] <Repository>\n"
"\t [<Directory>]\n" "\t [<Directory>]\n"
   
#. type: Plain text #. type: Plain text
...@@ -13780,10 +13794,17 @@ msgstr "--bare" ...@@ -13780,10 +13794,17 @@ msgstr "--bare"
   
#. type: Plain text #. type: Plain text
#: en/git-clone.txt:159 #: en/git-clone.txt:159
#, fuzzy, priority:300 #, priority:300
#| msgid "Make a 'bare' GIT repository. That is, instead of creating `<directory>` and placing the administrative files in `<directory>/.git`, make the `<directory>` itself the `$GIT_DIR`. This obviously implies the `-n` because there is nowhere to check out the working tree. Also the branch heads at the remote are copied directly to corresponding local branch heads, without mapping them to `refs/remotes/origin/`. When this option is used, neither remote-tracking branches nor the related configuration variables are created."
msgid "Make a 'bare' Git repository. That is, instead of creating `<directory>` and placing the administrative files in `<directory>/.git`, make the `<directory>` itself the `$GIT_DIR`. This obviously implies the `--no-checkout` because there is nowhere to check out the working tree. Also the branch heads at the remote are copied directly to corresponding local branch heads, without mapping them to `refs/remotes/origin/`. When this option is used, neither remote-tracking branches nor the related configuration variables are created." msgid "Make a 'bare' Git repository. That is, instead of creating `<directory>` and placing the administrative files in `<directory>/.git`, make the `<directory>` itself the `$GIT_DIR`. This obviously implies the `--no-checkout` because there is nowhere to check out the working tree. Also the branch heads at the remote are copied directly to corresponding local branch heads, without mapping them to `refs/remotes/origin/`. When this option is used, neither remote-tracking branches nor the related configuration variables are created."
msgstr "Erzeuge ein 'reines' GIT repository, d.h. anstatt ein '<verzeichnis>' zu erzeugen und die administrativen Dateien unter '<verzeichnis>/.git' abzulegen werden diese direkt unter '<verzeichnis>' als '$GIT_DIR' abgelegt. Dies impliziert die '-n' Option, da ein Abrufen (checkout) des Arbeitsbereichs offensichtlich nicht möglich ist. Zusätzlcih werden die Entwicklungszweige des fernen Projektarchivs direkt zu den entsprechenden lokalen Entwicklungszweigen kopiert, ohne Zuordnungen über 'refs/remotes/origin/' anzulegen. Wird diese Option angegeben, so werden weder remote-tracking Entwicklungszweige noch die dazugehörigen Konfigurationsvariablen angelegt. Also the branch heads at the remote are copied directly to corresponding local branch heads, without mapping them to `refs/remotes/origin/`. When this option is used, neither remote-tracking branches nor the related configuration variables are created." msgstr ""
"Erstellt ein `bare` Git-Repository. D.h. anstatt ein `<Directory>` zu "
"erstellen und die Verwaltungsdateien in `<Directory>/.git` abzulegen, wird "
"aus dem `<Directory>` selbst das `$GIT_DIR`. Dies impliziert offensichtlich "
"`--no-checkout`, weil es nirgendwo eine Möglichkeit gibt, das Arbeitsbereich "
"auszuchecken. Auch die Branch-Heads auf der Remote-Seite werden direkt auf "
"die entsprechenden lokalen Branch-Heads kopiert, ohne sie auf `refs/remotes/"
"origin/` abzubilden. Wenn diese Option verwendet wird, werden weder Remote-"
"Tracking-Branches noch die zugehörigen Konfigurationsvariablen erstellt."
   
#. type: Labeled list #. type: Labeled list
#: en/git-clone.txt:160 en/git-show-branch.txt:67 en/rev-list-options.txt:358 en/rev-list-options.txt:491 #: en/git-clone.txt:160 en/git-show-branch.txt:67 en/rev-list-options.txt:358 en/rev-list-options.txt:491
...@@ -13799,10 +13820,9 @@ msgstr "Initialisiert die Sparse-Checkout-Datei so, dass das Arbeitsverzeichnis ...@@ -13799,10 +13820,9 @@ msgstr "Initialisiert die Sparse-Checkout-Datei so, dass das Arbeitsverzeichnis
   
#. type: Labeled list #. type: Labeled list
#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:867 #: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:867
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
#| msgid "--file=<file>"
msgid "--filter=<filter-spec>" msgid "--filter=<filter-spec>"
msgstr "--file=<file>" msgstr "--filter=<Filter-Spezifikation>"
   
#. type: Plain text #. type: Plain text
#: en/git-clone.txt:175 #: en/git-clone.txt:175
...@@ -29539,18 +29559,14 @@ msgstr "git-init-db – Erstellt ein leeres Git-Repository oder initialisiert ei ...@@ -29539,18 +29559,14 @@ msgstr "git-init-db – Erstellt ein leeres Git-Repository oder initialisiert ei
   
#. type: Plain text #. type: Plain text
#: en/git-init.txt:15 #: en/git-init.txt:15
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
#| msgid ""
#| "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
#| "\t [--separate-git-dir <git dir>]\n"
#| "\t [--shared[=<permissions>]] [directory]\n"
msgid "" msgid ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n" "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
"\t [--separate-git-dir <git dir>] [--object-format=<format]\n" "\t [--separate-git-dir <git dir>] [--object-format=<format]\n"
"\t [--shared[=<permissions>]] [directory]\n" "\t [--shared[=<permissions>]] [directory]\n"
msgstr "" msgstr ""
"'git init' [-q | --quiet] [--bare] [--template=<Template-Verzeichnis>]\n" "'git init' [-q | --quiet] [--bare] [--template=<Template-Verzeichnis>]\n"
"\t [--separate-git-dir <Git-Verzeichnis>]\n" "\t [--separate-git-dir <Git-Verzeichnis>] [--object-format=<Format>]\n"
"\t [--shared[=<Berechtigungen>]] [Verzeichnis]\n" "\t [--shared[=<Berechtigungen>]] [Verzeichnis]\n"
   
#. type: Plain text #. type: Plain text
...@@ -29567,9 +29583,12 @@ msgstr "Wenn die Umgebungsvariable `$GIT_DIR` gesetzt ist, dann gibt sie einen P ...@@ -29567,9 +29583,12 @@ msgstr "Wenn die Umgebungsvariable `$GIT_DIR` gesetzt ist, dann gibt sie einen P
   
#. type: Plain text #. type: Plain text
#: en/git-init.txt:32 #: en/git-init.txt:32
#, fuzzy, priority:300 #, priority:300
msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used." msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr "Wenn das Objektverzeichnis über diese Umgebungsvariable angegeben wird werden die SHA1-Verzeichnisse darunter angelegt, ansonsten wird standardmäßig Das Verzeichnis`$GIT_DIR/objects` verwendet." msgstr ""
"Wenn das Objektverzeichnis über die Umgebungsvariable `$GIT_OBJECT_DIRECTORY`"
" angegeben wird, werden die SHA1-Verzeichnisse darunter angelegt – "
"andernfalls wird das Standardverzeichnis `$GIT_DIR/objects` verwendet."
   
#. type: Plain text #. type: Plain text
#: en/git-init.txt:37 #: en/git-init.txt:37
...@@ -29591,16 +29610,18 @@ msgstr "Erstellt ein Bare-Repository. Wenn die Umgebungsvariable `GIT_DIR` nicht ...@@ -29591,16 +29610,18 @@ msgstr "Erstellt ein Bare-Repository. Wenn die Umgebungsvariable `GIT_DIR` nicht
   
#. type: Labeled list #. type: Labeled list
#: en/git-init.txt:51 #: en/git-init.txt:51
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
#| msgid "--format=<format>"
msgid "--object-format=<format>" msgid "--object-format=<format>"
msgstr "--format=<Format>" msgstr "--object-format=<Format>"
   
#. type: Plain text #. type: Plain text
#: en/git-init.txt:55 #: en/git-init.txt:55
#, priority:300 #, 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." 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 "" msgstr ""
"Spezifiziert das angegebene Objektformat (Hash-Algorithmus) für das "
"Repository. Die gültigen Werte sind 'sha1' und, falls aktiviert, 'sha256'. "
"sha1\" ist die Voreinstellung."
   
#. type: Plain text #. type: Plain text
#: en/git-init.txt:60 #: en/git-init.txt:60
...@@ -53654,8 +53675,8 @@ msgstr "" ...@@ -53654,8 +53675,8 @@ msgstr ""
msgid "`GIT_COMMON_DIR`" msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`" msgstr "`GIT_COMMON_DIR`"
   
#. type: Plain text
# noqa # noqa
#. type: Plain text
#: en/git.txt:495 #: en/git.txt:495
#, ignore-ellipsis, priority:100 #, ignore-ellipsis, priority:100
msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..." msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
po/documentation.fr.po
+ 140
− 122
View file @ 20fb0ae5
...@@ -7,7 +7,7 @@ msgstr "" ...@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: git documentation\n" "Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
"POT-Creation-Date: 2020-05-16 17:29+0200\n" "POT-Creation-Date: 2020-05-16 17:29+0200\n"
"PO-Revision-Date: 2020-05-16 17:47+0000\n" "PO-Revision-Date: 2020-05-17 07:57+0000\n"
"Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n" "Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language: fr\n" "Language: fr\n"
...@@ -2791,7 +2791,6 @@ msgstr "" ...@@ -2791,7 +2791,6 @@ msgstr ""
"par exemple, `2005-04-07T22:13:13.019` sera considéré comme étant " "par exemple, `2005-04-07T22:13:13.019` sera considéré comme étant "
"`2005-04-07T22:13:13`" "`2005-04-07T22:13:13`"
   
#. type: Plain text #. type: Plain text
#: en/date-formats.txt:29 #: en/date-formats.txt:29
#, priority:280 #, priority:280
...@@ -6909,10 +6908,14 @@ msgstr "--no-gpg-sign" ...@@ -6909,10 +6908,14 @@ msgstr "--no-gpg-sign"
   
#. type: Plain text #. type: Plain text
#: en/git-am.txt:157 en/git-cherry-pick.txt:118 en/git-commit.txt:357 en/git-rebase.txt:395 en/git-revert.txt:99 #: en/git-am.txt:157 en/git-cherry-pick.txt:118 en/git-commit.txt:357 en/git-rebase.txt:395 en/git-revert.txt:99
#, fuzzy, priority:280 #, priority:280
#| 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."
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 both `commit.gpgSign` configuration variable, and earlier `--gpg-sign`." 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 both `commit.gpgSign` configuration variable, and earlier `--gpg-sign`."
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." 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."
   
#. type: Labeled list #. type: Labeled list
#: en/git-am.txt:158 en/git-merge.txt:116 en/git-rebase.txt:246 en/sequencer.txt:1 #: en/git-am.txt:158 en/git-merge.txt:116 en/git-rebase.txt:246 en/sequencer.txt:1
...@@ -9958,10 +9961,9 @@ msgstr "" ...@@ -9958,10 +9961,9 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-bugreport.txt:21 #: en/git-bugreport.txt:21
#, fuzzy, priority:100 #, priority:100
#| msgid "The following options select the commits to be shown:"
msgid "The following information is requested from the user:" msgid "The following information is requested from the user:"
msgstr "Les options suivantes sélectionnent les commits à afficher :" msgstr "Les informations suivantes sont demandées à l'utilisateur :"
   
#. type: Plain text #. type: Plain text
#: en/git-bugreport.txt:23 #: en/git-bugreport.txt:23
...@@ -10019,17 +10021,15 @@ msgstr "" ...@@ -10019,17 +10021,15 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-bugreport.txt:40 #: en/git-bugreport.txt:40
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "-/ <path>"
msgid "-o <path>" msgid "-o <path>"
msgstr "-/ <chemin>" msgstr "-o <chemin>"
   
#. type: Labeled list #. type: Labeled list
#: en/git-bugreport.txt:41 #: en/git-bugreport.txt:41
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "--no-empty-directory"
msgid "--output-directory <path>" msgid "--output-directory <path>"
msgstr "--no-empty-directory" msgstr "--output-directory <chemin>"
   
#. type: Plain text #. type: Plain text
#: en/git-bugreport.txt:44 #: en/git-bugreport.txt:44
...@@ -10039,17 +10039,15 @@ msgstr "" ...@@ -10039,17 +10039,15 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-bugreport.txt:45 #: en/git-bugreport.txt:45
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "--date <format>"
msgid "-s <format>" msgid "-s <format>"
msgstr "--date <format>" msgstr "-s <format>"
   
#. type: Labeled list #. type: Labeled list
#: en/git-bugreport.txt:46 #: en/git-bugreport.txt:46
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "--format <format>"
msgid "--suffix <format>" msgid "--suffix <format>"
msgstr "--format <format>" msgstr "--suffix <format>"
   
#. type: Plain text #. type: Plain text
#: en/git-bugreport.txt:50 #: en/git-bugreport.txt:50
...@@ -12149,10 +12147,16 @@ msgstr "--recurse-submodules" ...@@ -12149,10 +12147,16 @@ msgstr "--recurse-submodules"
   
#. type: Plain text #. type: Plain text
#: en/git-checkout.txt:302 #: en/git-checkout.txt:302
#, fuzzy, priority:240 #, priority:240
#| msgid "Using `--recurse-submodules` will update the content of all initialized submodules according to the commit recorded in the superproject. If local modifications in a submodule would be overwritten the checkout will fail unless `-f` is used. If nothing (or `--no-recurse-submodules`) is used, the work trees of submodules will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodule."
msgid "Using `--recurse-submodules` will update the content of all active submodules according to the commit recorded in the superproject. If local modifications in a submodule would be overwritten the checkout will fail unless `-f` is used. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodule." msgid "Using `--recurse-submodules` will update the content of all active submodules according to the commit recorded in the superproject. If local modifications in a submodule would be overwritten the checkout will fail unless `-f` is used. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodule."
msgstr "L'utilisation de `--recurse-submodules` permet de mettre à jour le contenu de tous les sous-modules initialisés en fonction du commit enregistré dans le super-projet. Si des modifications locales au sous-modules seraient écrasées, l'extraction échoue à moins d'utiliser `-f`. Si l'option n'est pas spécifiée (ou si `--no-recurse-submodules` est spécifié), les arbres de travail des sous-modules ne sont pas mis à jour. Comme linkgit:git-submodule[1], la `HEAD` des sous-modules sera détachée." msgstr ""
"L'utilisation de `--recurse-submodules` permet de mettre à jour le contenu "
"de tous les sous-modules actifs en fonction du commit enregistré dans le "
"super-projet. Si des modifications locales au sous-modules seraient "
"écrasées, l'extraction échoue à moins d'utiliser `-f`. Si l'option n'est pas "
"spécifiée (ou si `--no-recurse-submodules` est spécifié), les arbres de "
"travail des sous-modules ne sont pas mis à jour. Comme linkgit:git-"
"submodule[1], la `HEAD` des sous-modules sera détachée."
   
#. type: Labeled list #. type: Labeled list
#: en/git-checkout.txt:303 en/git-restore.txt:118 #: en/git-checkout.txt:303 en/git-restore.txt:118
...@@ -14492,10 +14496,14 @@ msgstr "Lire le message de validation depuis le fichier indiqué. Utilisez '-' p ...@@ -14492,10 +14496,14 @@ msgstr "Lire le message de validation depuis le fichier indiqué. Utilisez '-' p
   
#. type: Plain text #. type: Plain text
#: en/git-commit-tree.txt:69 #: en/git-commit-tree.txt:69
#, fuzzy, priority:100 #, priority:100
#| 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."
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." 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." 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."
   
#. type: Title - #. type: Title -
#: en/git-commit-tree.txt:71 #: en/git-commit-tree.txt:71
...@@ -16872,10 +16880,9 @@ msgstr "" ...@@ -16872,10 +16880,9 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-credential.txt:121 #: en/git-credential.txt:121
#, fuzzy, priority:100 #, priority:100
#| msgid "support the following date formats:"
msgid "Git understands the following attributes:" msgid "Git understands the following attributes:"
msgstr "prend en charge les formats de date suivants :" msgstr "Git comprend les attributs suivants :"
   
#. type: Labeled list #. type: Labeled list
#: en/git-credential.txt:122 #: en/git-credential.txt:122
...@@ -20771,17 +20778,15 @@ msgstr "" ...@@ -20771,17 +20778,15 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-fast-import.txt:128 #: en/git-fast-import.txt:128
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "--exclude-from=<file>"
msgid "--rewrite-submodules-from=<name>:<file>" msgid "--rewrite-submodules-from=<name>:<file>"
msgstr "--exclude-from=<fichier>" msgstr "--rewrite-submodules-from=<nom>:<fichier>"
   
#. type: Labeled list #. type: Labeled list
#: en/git-fast-import.txt:129 #: en/git-fast-import.txt:129
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "--recurse-submodules[=<pathspec]"
msgid "--rewrite-submodules-to=<name>:<file>" msgid "--rewrite-submodules-to=<name>:<file>"
msgstr "--recurse-submodules[=<spéc de chemin>]" msgstr "--rewrite-submodules-to=<nom>:<fichier>"
   
#. type: Plain text #. type: Plain text
#: en/git-fast-import.txt:131 #: en/git-fast-import.txt:131
...@@ -27392,10 +27397,13 @@ msgstr "" ...@@ -27392,10 +27397,13 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-grep.txt:213 #: en/git-grep.txt:213
#, fuzzy, priority:100 #, priority:100
#| msgid "Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see git-config(1))." msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see git-config(1))."
msgstr "Sans cette option, les noms de chemin avec des caractères « inhabituels » sont cités comme expliqué pour la variable de configuration `core.quotePath` (voir linkgit:git-config[1])." msgstr ""
"Utiliser \\ 0 comme délimiteur pour les noms de chemin dans la sortie et les "
"afficher verbatim. Sans cette option, les noms de chemin avec des caractères "
"« inhabituels » sont cités comme expliqué pour la variable de configuration "
"core.quotePath (voir linkgit:git-config[1])."
   
#. type: Labeled list #. type: Labeled list
#: en/git-grep.txt:215 #: en/git-grep.txt:215
...@@ -29466,18 +29474,14 @@ msgstr "git-init - Crée un dépôt Git vide ou réinitialise un dépôt existan ...@@ -29466,18 +29474,14 @@ msgstr "git-init - Crée un dépôt Git vide ou réinitialise un dépôt existan
   
#. type: Plain text #. type: Plain text
#: en/git-init.txt:15 #: en/git-init.txt:15
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
#| msgid ""
#| "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
#| "\t [--separate-git-dir <git dir>]\n"
#| "\t [--shared[=<permissions>]] [directory]\n"
msgid "" msgid ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n" "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
"\t [--separate-git-dir <git dir>] [--object-format=<format]\n" "\t [--separate-git-dir <git dir>] [--object-format=<format]\n"
"\t [--shared[=<permissions>]] [directory]\n" "\t [--shared[=<permissions>]] [directory]\n"
msgstr "" msgstr ""
"'git init' [-q | --quiet] [--bare] [--template=<répertoire_modèle>]\n" "'git init' [-q | --quiet] [--bare] [--template=<répertoire_modèle>]\n"
"\t [--separate-git-dir <répertoire git>]\n" "\t [--separate-git-dir <répertoire git>] [--object-format=<format>]\n"
"\t [--shared[=<permissions>]] [dossier]\n" "\t [--shared[=<permissions>]] [dossier]\n"
   
#. type: Plain text #. type: Plain text
...@@ -29518,10 +29522,9 @@ msgstr "Créer un dépôt nu. Si l'environnement `GIT_DIR` n'est pas défini, al ...@@ -29518,10 +29522,9 @@ msgstr "Créer un dépôt nu. Si l'environnement `GIT_DIR` n'est pas défini, al
   
#. type: Labeled list #. type: Labeled list
#: en/git-init.txt:51 #: en/git-init.txt:51
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
#| msgid "--format=<format>"
msgid "--object-format=<format>" msgid "--object-format=<format>"
msgstr "--format=<format>" msgstr "--object-format=<format>"
   
#. type: Plain text #. type: Plain text
#: en/git-init.txt:55 #: en/git-init.txt:55
...@@ -30626,10 +30629,16 @@ msgstr "--decorate-refs-exclude=<motif>" ...@@ -30626,10 +30629,16 @@ msgstr "--decorate-refs-exclude=<motif>"
   
#. type: Plain text #. type: Plain text
#: en/git-log.txt:50 #: en/git-log.txt:50
#, fuzzy, priority:260 #, priority:260
#| msgid "If no `--decorate-refs` is given, pretend as if all refs were included. For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`."
msgid "If no `--decorate-refs` is given, pretend as if all refs were included. For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`." msgid "If no `--decorate-refs` is given, pretend as if all refs were included. For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
msgstr "Si aucun `--decorate-refs' n'est donné, faire comme si tous les refs étaient inclus. Pour chaque candidat, ne pas l'utiliser pour la décoration s'il correspond à un motif fourni à `--decorate-refs-exclude' ou s'il ne correspond à aucun des motifs fournis à `--decorate-refs'." msgstr ""
"Si aucun `--decorate-refs' n'est donné, faire comme si tous les refs étaient "
"inclus. Pour chaque candidat, ne pas l'utiliser pour la décoration s'il "
"correspond à un motif fourni à `--decorate-refs-exclude' ou s'il ne "
"correspond à aucun des motifs fournis à `--decorate-refs'. L'option de "
"configuration `log.excludeDecoration` permet d'exclure les références des "
"décorations, mais un motif explicite `--decorate-refs` remplacera une "
"correspondance dans `log.excludeDecoration`."
   
#. type: Labeled list #. type: Labeled list
#: en/git-log.txt:51 #: en/git-log.txt:51
...@@ -33036,10 +33045,12 @@ msgstr "Écraser silencieusement les fichiers ignorés du résultat de la fusion ...@@ -33036,10 +33045,12 @@ msgstr "Écraser silencieusement les fichiers ignorés du résultat de la fusion
   
#. type: Plain text #. type: Plain text
#: en/git-merge.txt:99 #: en/git-merge.txt:99
#, fuzzy, priority:240 #, priority:240
#| msgid "Abort the current conflict resolution process, and try to reconstruct the pre-merge state."
msgid "Abort the current conflict resolution process, and try to reconstruct the pre-merge state. If an autostash entry is present, apply it to the worktree." msgid "Abort the current conflict resolution process, and try to reconstruct the pre-merge state. If an autostash entry is present, apply it to the worktree."
msgstr "Abandonner le processus actuel de résolution des conflits, et essayer de reconstruire l'état antérieur à la fusion." msgstr ""
"Abandonner le processus actuel de résolution des conflits, et essayer de "
"reconstruire l'état antérieur à la fusion. Si une entrée de remisage "
"automatique est présente, l'appliquer à l'arbre de travail."
   
#. type: Plain text #. type: Plain text
#: en/git-merge.txt:104 #: en/git-merge.txt:104
...@@ -33055,10 +33066,12 @@ msgstr "" ...@@ -33055,10 +33066,12 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-merge.txt:115 #: en/git-merge.txt:115
#, fuzzy, priority:240 #, priority:240
#| msgid "Forget about the current merge in progress. Leave the index and the working tree as-is."
msgid "Forget about the current merge in progress. Leave the index and the working tree as-is. If `MERGE_AUTOSTASH` is present, the stash entry will be saved to the stash list." msgid "Forget about the current merge in progress. Leave the index and the working tree as-is. If `MERGE_AUTOSTASH` is present, the stash entry will be saved to the stash list."
msgstr "Oublier la fusion en cours. Laisser l'index et l'arbre de travail en l'ếtat." msgstr ""
"Oublier la fusion en cours. Laisser l'index et l'arbre de travail en l'ếtat. "
"Si `MERGE_AUTOSTASH` est présent, l'entrée de la remisage sera sauvegardée "
"dans la liste des remisages."
   
#. type: Plain text #. type: Plain text
#: en/git-merge.txt:120 #: en/git-merge.txt:120
...@@ -35102,10 +35115,9 @@ msgstr "" ...@@ -35102,10 +35115,9 @@ msgstr ""
   
#. type: Title ~ #. type: Title ~
#: en/git-p4.txt:391 #: en/git-p4.txt:391
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "--ignore-space-change"
msgid "p4-prepare-changelist" msgid "p4-prepare-changelist"
msgstr "--ignore-space-change" msgstr "p4-prepare-changelist"
   
#. type: Plain text #. type: Plain text
#: en/git-p4.txt:398 #: en/git-p4.txt:398
...@@ -35121,10 +35133,9 @@ msgstr "" ...@@ -35121,10 +35133,9 @@ msgstr ""
   
#. type: Title ~ #. type: Title ~
#: en/git-p4.txt:404 #: en/git-p4.txt:404
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "`changes`"
msgid "p4-changelist" msgid "p4-changelist"
msgstr "`changes`" msgstr "p4-changelist"
   
#. type: Plain text #. type: Plain text
#: en/git-p4.txt:411 #: en/git-p4.txt:411
...@@ -36911,10 +36922,13 @@ msgstr "--[no-]recurse-submodules[=yes|on-demand|no]" ...@@ -36911,10 +36922,13 @@ msgstr "--[no-]recurse-submodules[=yes|on-demand|no]"
   
#. type: Plain text #. type: Plain text
#: en/git-pull.txt:92 #: en/git-pull.txt:92
#, fuzzy, priority:220 #, priority:220
#| msgid "This option controls if new commits of all populated submodules should be fetched and updated, too (see linkgit:git-config[1] and linkgit:gitmodules[5])."
msgid "This option controls if new commits of populated submodules should be fetched, and if the working trees of active submodules should be updated, too (see linkgit:git-fetch[1], linkgit:git-config[1] and linkgit:gitmodules[5])." msgid "This option controls if new commits of populated submodules should be fetched, and if the working trees of active submodules should be updated, too (see linkgit:git-fetch[1], linkgit:git-config[1] and linkgit:gitmodules[5])."
msgstr "Cette option contrôle si les nouveaux commits de tous les sous-modules peuplés doivent être récupérés et mis à jour également (voir linkgit:git-config[1] et linkgit:gitmodules[5])." msgstr ""
"Cette option contrôle si les nouveaux commits des sous-modules peuplés "
"doivent être récupérés et si les arbres de travail des sous-modules actifs "
"devraient être aussi mis à jour (voir linkgit:git-fetch[1], linkgit:git-"
"config[1] et linkgit:gitmodules[5])."
   
#. type: Plain text #. type: Plain text
#: en/git-pull.txt:94 #: en/git-pull.txt:94
...@@ -37108,10 +37122,12 @@ msgstr "$ git pull origin next\n" ...@@ -37108,10 +37122,12 @@ msgstr "$ git pull origin next\n"
   
#. type: Plain text #. type: Plain text
#: en/git-pull.txt:227 #: en/git-pull.txt:227
#, fuzzy, priority:220 #, priority:220
#| msgid "This leaves a copy of `next` temporarily in FETCH_HEAD, but does not update any remote-tracking branches. Using remote-tracking branches, the same can be done by invoking fetch and merge:"
msgid "This leaves a copy of `next` temporarily in FETCH_HEAD, and updates the remote-tracking branch `origin/next`. The same can be done by invoking fetch and merge:" msgid "This leaves a copy of `next` temporarily in FETCH_HEAD, and updates the remote-tracking branch `origin/next`. The same can be done by invoking fetch and merge:"
msgstr "Cela laisse une copie de `next` temporairement dans FETCH_HEAD, mais ne met pas à jour les branches de suivi à distance. En utilisant les branches de suivi à distance, la même chose peut être faite en invoquant fetch et merge :" msgstr ""
"Cela laisse une copie de `next` temporairement dans FETCH_HEAD, et met pas à "
"jour la branche de suivi à distance `origin/next`. La même chose peut être "
"faite en invoquant fetch et merge :"
   
#. type: delimited block - #. type: delimited block -
#: en/git-pull.txt:231 #: en/git-pull.txt:231
...@@ -38452,10 +38468,13 @@ msgstr "--[no-]recurse-submodules" ...@@ -38452,10 +38468,13 @@ msgstr "--[no-]recurse-submodules"
   
#. type: Plain text #. type: Plain text
#: en/git-read-tree.txt:123 #: en/git-read-tree.txt:123
#, fuzzy, priority:100 #, priority:100
#| msgid "Using `--recurse-submodules` will update the content of all initialized submodules according to the commit recorded in the superproject. If nothing (or `--no-recurse-submodules`) is used, the work trees of submodules will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodules."
msgid "Using --recurse-submodules will update the content of all active submodules according to the commit recorded in the superproject by calling read-tree recursively, also setting the submodules' HEAD to be detached at that commit." msgid "Using --recurse-submodules will update the content of all active submodules according to the commit recorded in the superproject by calling read-tree recursively, also setting the submodules' HEAD to be detached at that commit."
msgstr "L'utilisation de `--recurse-submodules` permet de mettre à jour le contenu de tous les sous-modules initialisés en fonction du commit enregistré dans le super-projet. Si l'option n'est pas spécifiée (ou si `--no-recurse-submodules` est spécifié), les arbres de travail des sous-modules ne sont pas mis à jour. Comme linkgit:git-submodule[1], les `HEAD` des sous-modules seront détachées." msgstr ""
"L'utilisation de `--recurse-submodules` permet de mettre à jour le contenu "
"de tous les sous-modules actifs en fonction du commit enregistré dans le "
"super-projet en appelant récursivement read-tree, en définissant également "
"le HEAD des sous-modules à détacher à ce commit."
   
#. type: Labeled list #. type: Labeled list
#: en/git-read-tree.txt:124 #: en/git-read-tree.txt:124
...@@ -39880,10 +39899,9 @@ msgstr "" ...@@ -39880,10 +39899,9 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-rebase.txt:642 #: en/git-rebase.txt:642
#, fuzzy, priority:100 #, priority:100
#| msgid "--fork-point"
msgid "--fork-point and --root" msgid "--fork-point and --root"
msgstr "--fork-point" msgstr "--fork-point et --root"
   
#. type: Plain text #. type: Plain text
#: en/git-rebase.txt:644 #: en/git-rebase.txt:644
...@@ -44109,10 +44127,16 @@ msgstr "En mode d'extraction clairsemé, le comportement par défaut met seuleme ...@@ -44109,10 +44127,16 @@ msgstr "En mode d'extraction clairsemé, le comportement par défaut met seuleme
   
#. type: Plain text #. type: Plain text
#: en/git-restore.txt:117 #: en/git-restore.txt:117
#, fuzzy, priority:100 #, priority:100
#| msgid "Using `--recurse-submodules` will update the content of all initialized submodules according to the commit recorded in the superproject. If nothing (or `--no-recurse-submodules`) is used, the work trees of submodules will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodules."
msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule." msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule."
msgstr "L'utilisation de `--recurse-submodules` permet de mettre à jour le contenu de tous les sous-modules initialisés en fonction du commit enregistré dans le super-projet. Si l'option n'est pas spécifiée (ou si `--no-recurse-submodules` est spécifié), les arbres de travail des sous-modules ne sont pas mis à jour. Comme linkgit:git-submodule[1], les `HEAD` des sous-modules seront détachées." msgstr ""
"Si `<pathspec>` nomme un sous-module actif et que l'emplacement de la "
"restauration inclut l'arbre de travail, le sous-module ne sera mis à jour "
"que si cette option est donnée, auquel cas son arbre de travail sera "
"restauré au commit enregistré dans le superprojet, et toute modification "
"locale sera écrasée. Si rien (ou `--no-recurse-submodules`) n'est utilisé, "
"les arbres de travail des sous-modules ne seront pas mis à jour. Tout comme "
"linkgit:git-checkout[1], cela détachera le `HEAD` du sous-module."
   
#. type: Plain text #. type: Plain text
#: en/git-restore.txt:124 #: en/git-restore.txt:124
...@@ -52291,10 +52315,15 @@ msgstr "`git switch` échoue quand la référence voulue est déjà extraite dan ...@@ -52291,10 +52315,15 @@ msgstr "`git switch` échoue quand la référence voulue est déjà extraite dan
   
#. type: Plain text #. type: Plain text
#: en/git-switch.txt:189 #: en/git-switch.txt:189
#, fuzzy, priority:100 #, priority:100
#| msgid "Using `--recurse-submodules` will update the content of all initialized submodules according to the commit recorded in the superproject. If nothing (or `--no-recurse-submodules`) is used, the work trees of submodules will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodules."
msgid "Using `--recurse-submodules` will update the content of all active submodules according to the commit recorded in the superproject. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodules." msgid "Using `--recurse-submodules` will update the content of all active submodules according to the commit recorded in the superproject. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodules."
msgstr "L'utilisation de `--recurse-submodules` permet de mettre à jour le contenu de tous les sous-modules initialisés en fonction du commit enregistré dans le super-projet. Si l'option n'est pas spécifiée (ou si `--no-recurse-submodules` est spécifié), les arbres de travail des sous-modules ne sont pas mis à jour. Comme linkgit:git-submodule[1], les `HEAD` des sous-modules seront détachées." msgstr ""
"L'utilisation de `--recurse-submodules` permet de mettre à jour le contenu "
"de tous les sous-modules actifs en fonction du commit enregistré dans le "
"super-projet. Si l'option n'est pas spécifiée (ou si `--no-recurse-"
"submodules` est spécifié), les arbres de travail des sous-modules ne sont "
"pas mis à jour. Comme linkgit:git-submodule[1], les `HEAD` des sous-modules "
"seront détachées."
   
#. type: Plain text #. type: Plain text
#: en/git-switch.txt:194 #: en/git-switch.txt:194
...@@ -55976,10 +56005,9 @@ msgstr "" ...@@ -55976,10 +56005,9 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-update-ref.txt:139 #: en/git-update-ref.txt:139
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "--abort"
msgid "abort" msgid "abort"
msgstr "--abort" msgstr "abort"
   
#. type: Plain text #. type: Plain text
#: en/git-update-ref.txt:142 #: en/git-update-ref.txt:142
...@@ -57249,7 +57277,16 @@ msgstr "DÉTAILS" ...@@ -57249,7 +57277,16 @@ msgstr "DÉTAILS"
#: en/git-worktree.txt:276 #: en/git-worktree.txt:276
#, priority:240 #, priority:240
msgid "Each linked working tree has a private sub-directory in the repository's $GIT_DIR/worktrees directory. The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique. For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)." msgid "Each linked working tree has a private sub-directory in the repository's $GIT_DIR/worktrees directory. The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique. For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
msgstr "Chaque arbre de travail lié possède un sous-répertoire privé dans le répertoire $ GIT_DIR / worktrees du dépôt. Le nom du sous-répertoire privé est généralement le nom de base du chemin de l'arbre de travail lié, éventuellement accompagné d'un numéro pour le rendre unique. Par exemple, lorsque `$GIT_DIR=/chemin/principal/ .git`, la commande`git worktree add /chemin/autre/test-prochain prochain` crée l'arbre de travail lié dans `/path/autre/test-prochain` et aussi crée un répertoire `$GIT_DIR/worktrees/test-prochain` (ou`$GIT_DIR/worktrees/test-prochain1` si `test-prochain` est déjà pris)." msgstr ""
"Chaque arbre de travail lié possède un sous-répertoire privé dans le "
"répertoire $ GIT_DIR/worktrees du dépôt. Le nom du sous-répertoire privé est "
"généralement le nom de base du chemin de l'arbre de travail lié, "
"éventuellement accompagné d'un numéro pour le rendre unique. Par exemple, "
"lorsque `$GIT_DIR=/chemin/principal/ .git`, la commande`git worktree add /"
"chemin/autre/test-prochain prochain` crée l'arbre de travail lié dans `/"
"chemin/autre/test-prochain` et crée aussi un répertoire `$GIT_DIR/worktrees/"
"test-prochain` (ou`$GIT_DIR/worktrees/test-prochain1` si `test-prochain` est "
"déjà pris)."
   
#. type: Plain text #. type: Plain text
#: en/git-worktree.txt:282 #: en/git-worktree.txt:282
...@@ -59057,10 +59094,14 @@ msgstr "Dans le cas `--ff-only`, il faut résoudre la fusion en avance rapide lo ...@@ -59057,10 +59094,14 @@ msgstr "Dans le cas `--ff-only`, il faut résoudre la fusion en avance rapide lo
   
#. type: Plain text #. type: Plain text
#: en/merge-options.txt:70 #: en/merge-options.txt:70
#, fuzzy, priority:240 #, priority:240
#| msgid "GPG-sign the resulting merge commit. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space."
msgid "GPG-sign the resulting merge commit. 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 both `commit.gpgSign` configuration variable, and earlier `--gpg-sign`." msgid "GPG-sign the resulting merge commit. 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 both `commit.gpgSign` configuration variable, and earlier `--gpg-sign`."
msgstr "Signer le commit résultant de la fusion 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." msgstr ""
"Signer le commit résultant de la fusion 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."
   
#. type: Plain text #. type: Plain text
#: en/merge-options.txt:76 #: en/merge-options.txt:76
...@@ -59764,10 +59805,9 @@ msgstr "" ...@@ -59764,10 +59805,9 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/pretty-formats.txt:87 #: en/pretty-formats.txt:87
#, fuzzy, priority:260 #, priority:260
#| msgid "--mboxrd"
msgid "'mboxrd'" msgid "'mboxrd'"
msgstr "--mboxrd" msgstr "'mboxrd'"
   
#. type: Plain text #. type: Plain text
#: en/pretty-formats.txt:91 #: en/pretty-formats.txt:91
...@@ -62740,10 +62780,9 @@ msgstr "La liste des parents de `Q` a rendu `Y` simplifié en `X`. `X` a ensuite ...@@ -62740,10 +62780,9 @@ msgstr "La liste des parents de `Q` a rendu `Y` simplifié en `X`. `X` a ensuite
   
#. type: Plain text #. type: Plain text
#: en/rev-list-options.txt:544 #: en/rev-list-options.txt:544
#, fuzzy, priority:260 #, priority:260
#| msgid "Finally, there is a fifth simplification mode available:"
msgid "There is another simplification mode available:" msgid "There is another simplification mode available:"
msgstr "Enfin, il existe un cinquième mode de simplification :" msgstr "Il existe un autre mode de simplification :"
   
#. type: Plain text #. type: Plain text
#: en/rev-list-options.txt:550 #: en/rev-list-options.txt:550
...@@ -62815,13 +62854,7 @@ msgstr "" ...@@ -62815,13 +62854,7 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/rev-list-options.txt:597 #: en/rev-list-options.txt:597
#, fuzzy, no-wrap, priority:260 #, no-wrap, priority:260
#| msgid ""
#| "\t .-A---M---N---O---P---Q\n"
#| "\t / / / / /\n"
#| "\tI B / D /\n"
#| "\t \\ / / / /\n"
#| "\t `-------------'\n"
msgid "" msgid ""
"\t .-A---M-----C--N---O---P\n" "\t .-A---M-----C--N---O---P\n"
"\t / / \\ \\ \\/ / /\n" "\t / / \\ \\ \\/ / /\n"
...@@ -62863,13 +62896,7 @@ msgstr "" ...@@ -62863,13 +62896,7 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/rev-list-options.txt:630 #: en/rev-list-options.txt:630
#, fuzzy, no-wrap, priority:260 #, no-wrap, priority:260
#| msgid ""
#| "\t .-A---M---N---O---P---Q\n"
#| "\t / / / / /\n"
#| "\tI B / D /\n"
#| "\t \\ / / / /\n"
#| "\t `-------------'\n"
msgid "" msgid ""
"\t .-A---M--------N---O---P\n" "\t .-A---M--------N---O---P\n"
"\t / / \\ \\ \\/ / /\n" "\t / / \\ \\ \\/ / /\n"
...@@ -62899,13 +62926,7 @@ msgstr "" ...@@ -62899,13 +62926,7 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/rev-list-options.txt:653 #: en/rev-list-options.txt:653
#, fuzzy, no-wrap, priority:260 #, no-wrap, priority:260
#| msgid ""
#| "\t .-A---M---N---O\n"
#| "\t / / /\n"
#| "\tI B D\n"
#| "\t \\ / /\n"
#| "\t `---------'\n"
msgid "" msgid ""
"\t .-A---M--.\n" "\t .-A---M--.\n"
"\t / / \\\n" "\t / / \\\n"
...@@ -62965,13 +62986,7 @@ msgstr "" ...@@ -62965,13 +62986,7 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/rev-list-options.txt:701 #: en/rev-list-options.txt:701
#, fuzzy, no-wrap, priority:260 #, no-wrap, priority:260
#| msgid ""
#| "\t .-A---M---N---O\n"
#| "\t / / /\n"
#| "\tI B D\n"
#| "\t \\ / /\n"
#| "\t `---------'\n"
msgid "" msgid ""
"\t .-A---M--. N\n" "\t .-A---M--. N\n"
"\t / / \\ /\n" "\t / / \\ /\n"
...@@ -63169,7 +63184,10 @@ msgstr "--objects" ...@@ -63169,7 +63184,10 @@ msgstr "--objects"
#: en/rev-list-options.txt:830 #: en/rev-list-options.txt:830
#, priority:260 #, priority:260
msgid "Print the object IDs of any object referenced by the listed commits. `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''." msgid "Print the object IDs of any object referenced by the listed commits. `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''."
msgstr "Imprimer les ID d'objet de tout objet référencé par les commits listés. `--objets foo foo ^bar` signifie donc ``envoie-moi tous les ID d'objets que je dois télécharger si j'ai l'objet commit _bar_ mais pas _foo_''." msgstr ""
"Imprimer les ID d'objet de tout objet référencé par les commits listés. `--"
"objets foo ^bar` signifie donc ``envoie-moi tous les ID d'objets que je dois "
"télécharger si j'ai l'objet commit _bar_ mais pas _foo_''."
   
#. type: Labeled list #. type: Labeled list
#: en/rev-list-options.txt:831 #: en/rev-list-options.txt:831
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

feedback to tooltime@ajou.ac.kr or hwan@ajou.ac.kr