Skip to content
Snippets Groups Projects
Commit e6e20cf9 authored by Jean-Noël Avila's avatar Jean-Noël Avila Committed by Hosted Weblate
Browse files

Translated using Weblate (French) 

Currently translated at 39.5% (3906 of 9866 strings)

Translation: Git Manpages/Translations
Translate-URL: https://hosted.weblate.org/projects/git-manpages/translations/fr/


Signed-off-by: default avatarJean-Noël Avila <jn.avila@free.fr>
parent 8a5b8ba3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 285 additions and 254 deletions
po/documentation.fr.po
+ 285
− 254
View file @ e6e20cf9
...@@ -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-02-11 22:37+0100\n" "POT-Creation-Date: 2020-02-11 22:37+0100\n"
"PO-Revision-Date: 2020-03-16 21:35+0000\n" "PO-Revision-Date: 2020-03-19 21:36+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"
...@@ -41661,15 +41661,19 @@ msgstr "Passer l'option `--local` à 'git pack-objects'. Voir linkgit:git-pack-o ...@@ -41661,15 +41661,19 @@ msgstr "Passer l'option `--local` à 'git pack-objects'. Voir linkgit:git-pack-o
   
#. type: Plain text #. type: Plain text
#: en/git-repack.txt:73 #: en/git-repack.txt:73
#, fuzzy, priority:100 #, priority:100
msgid "Pass the `--no-reuse-delta` option to `git-pack-objects`, see linkgit:git-pack-objects[1]." msgid "Pass the `--no-reuse-delta` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
msgstr "Passer l'option `--local` à 'git pack-objects'. Voir linkgit:git-pack-objects[1]." msgstr ""
"Passer l'option `--no-reuse-delta` à `git-pack-objects`. Voir linkgit:git-"
"pack-objects[1]."
   
#. type: Plain text #. type: Plain text
#: en/git-repack.txt:77 #: en/git-repack.txt:77
#, fuzzy, priority:100 #, priority:100
msgid "Pass the `--no-reuse-object` option to `git-pack-objects`, see linkgit:git-pack-objects[1]." msgid "Pass the `--no-reuse-object` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
msgstr "Passer l'option `--local` à 'git pack-objects'. Voir linkgit:git-pack-objects[1]." msgstr ""
"Passer l'option `--no-reuse-object` à `git-pack-objects`. Voir linkgit:git-"
"pack-objects[1]."
   
#. type: Plain text #. type: Plain text
#: en/git-repack.txt:81 #: en/git-repack.txt:81
...@@ -41757,9 +41761,11 @@ msgstr "" ...@@ -41757,9 +41761,11 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-repack.txt:167 #: en/git-repack.txt:167
#, fuzzy, priority:100 #, priority:100
msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]." msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
msgstr "Passer l'option `--local` à 'git pack-objects'. Voir linkgit:git-pack-objects[1]." msgstr ""
"Passer l'option `--delta-islands` à `git-pack-objects`, voir linkgit:git-"
"pack-objects[1]."
   
#. type: Title - #. type: Title -
#: en/git-repack.txt:169 #: en/git-repack.txt:169
...@@ -41787,9 +41793,10 @@ msgstr "git-replace(1)" ...@@ -41787,9 +41793,10 @@ msgstr "git-replace(1)"
   
#. type: Plain text #. type: Plain text
#: en/git-replace.txt:7 #: en/git-replace.txt:7
#, fuzzy, priority:100 #, priority:100
msgid "git-replace - Create, list, delete refs to replace objects" msgid "git-replace - Create, list, delete refs to replace objects"
msgstr "Créer, lister, supprimer des référence pour remplacer des objets" msgstr ""
"git-replace - Crée, liste, supprime des référence pour remplacer des objets"
   
#. type: Plain text #. type: Plain text
#: en/git-replace.txt:17 #: en/git-replace.txt:17
...@@ -42039,10 +42046,12 @@ msgstr "" ...@@ -42039,10 +42046,12 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-replace.txt:158 #: en/git-replace.txt:158
#, fuzzy, priority:100 #, priority:100
#| msgid "linkgit:git-hash-object[1] linkgit:git-filter-branch[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1]"
msgid "linkgit:git-hash-object[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1] https://github.com/newren/git-filter-repo[git-filter-repo]" msgid "linkgit:git-hash-object[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1] https://github.com/newren/git-filter-repo[git-filter-repo]"
msgstr "linkgit:git-hash-object[1] linkgit:git-filter-branch[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1]" msgstr ""
"linkgit:git-hash-object[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit"
":git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1] "
"https://github.com/newren/git-filter-repo[git-filter-repo]"
   
#. type: Title = #. type: Title =
#: en/git-request-pull.txt:2 #: en/git-request-pull.txt:2
...@@ -42184,9 +42193,10 @@ msgstr "git-rerere(1)" ...@@ -42184,9 +42193,10 @@ msgstr "git-rerere(1)"
   
#. type: Plain text #. type: Plain text
#: en/git-rerere.txt:7 #: en/git-rerere.txt:7
#, fuzzy, priority:100 #, priority:100
msgid "git-rerere - Reuse recorded resolution of conflicted merges" msgid "git-rerere - Reuse recorded resolution of conflicted merges"
msgstr "Réutiliser une résolution enregistrée de fusions conflictuelles" msgstr ""
"git-rerere - Réutilise une résolution enregistrée de fusions conflictuelles"
   
#. type: Plain text #. type: Plain text
#: en/git-rerere.txt:12 #: en/git-rerere.txt:12
...@@ -43323,9 +43333,9 @@ msgstr "git-restore(1)" ...@@ -43323,9 +43333,9 @@ msgstr "git-restore(1)"
   
#. type: Plain text #. type: Plain text
#: en/git-restore.txt:7 #: en/git-restore.txt:7
#, fuzzy, priority:100 #, priority:100
msgid "git-restore - Restore working tree files" msgid "git-restore - Restore working tree files"
msgstr "Basculer de branche ou restaurer la copie de travail" msgstr "git-restore - Restaure les fichier d'un arbre de travail"
   
#. type: Plain text #. type: Plain text
#: en/git-restore.txt:14 #: en/git-restore.txt:14
...@@ -43362,17 +43372,15 @@ msgstr "" ...@@ -43362,17 +43372,15 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-restore.txt:36 #: en/git-restore.txt:36
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "<tree-ish>"
msgid "-s <tree>" msgid "-s <tree>"
msgstr "<arbre-esque>" msgstr "-s <arbre>"
   
#. type: Labeled list #. type: Labeled list
#: en/git-restore.txt:37 #: en/git-restore.txt:37
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "--source"
msgid "--source=<tree>" msgid "--source=<tree>"
msgstr "--source" msgstr "--source=<arbre>"
   
#. type: Plain text #. type: Plain text
#: en/git-restore.txt:41 #: en/git-restore.txt:41
...@@ -43388,10 +43396,13 @@ msgstr "" ...@@ -43388,10 +43396,13 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-restore.txt:53 #: en/git-restore.txt:53
#, fuzzy, priority:100 #, priority:100
#| msgid "This means that you can use `git checkout -p` to selectively discard edits from your current working tree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode." msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr "Ceci signifie que vous pouvez utiliser `git checkout -p` pour supprimer sélectivement les éditions depuis votre arbre de travail actuel. Voir la section « Mode Interactif » de linkgit:git-add[1] pour apprendre à utiliser le mode `--patch`." msgstr ""
"Sélectionner interactivement les sections dans la différence entre la source "
"de restauration et location de restauration. Voir la section « Mode "
"Interactif » de linkgit:git-add[1] pour apprendre à utiliser le mode "
"`--patch`."
   
#. type: Plain text #. type: Plain text
#: en/git-restore.txt:56 #: en/git-restore.txt:56
...@@ -43419,31 +43430,35 @@ msgstr "" ...@@ -43419,31 +43430,35 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-restore.txt:68 #: en/git-restore.txt:68
#, fuzzy, priority:100 #, priority:100
#| msgid "Quiet, suppress feedback messages."
msgid "Quiet, suppress feedback messages. Implies `--no-progress`." msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
msgstr "Silencieux, supprimer les messages d'état." msgstr "Silencieux, supprimer les messages d'état. Implique `--no-progress`."
   
#. type: Plain text #. type: Plain text
#: en/git-restore.txt:80 #: en/git-restore.txt:80
#, fuzzy, priority:100 #, priority:100
#| msgid "When checking out paths from the index, check out stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths." msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr "Lors de l'extraction de chemins depuis l'index, extraire l'état #2 ('ours', le nôtre) ou #3 ('theirs', le leur) pour les chemins non fusionnés." msgstr ""
"Lors de la restauration de fichiers dans l'arbre de travail, utiliser l'état "
"#2 ('ours', le nôtre) ou #3 ('theirs', le leur) pour les chemins non "
"fusionnés."
   
#. type: Plain text #. type: Plain text
#: en/git-restore.txt:84 #: en/git-restore.txt:84
#, fuzzy, priority:100 #, priority:100
#| msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped; `--ours` gives the version from the branch the changes are rebased onto, while `--theirs` gives the version from the branch that holds your work that is being rebased."
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details." msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
msgstr "Veuillez noter que pendant `git rebase` et `git pull --rebase`, `ours` et `theirs` peuvent sembler échangés ; `--ours` fournit la version depuis la branche sur laquelle les modifications sont rebasées, tandis que `--theirs` fournit la version de la branche qui contient le travail rebasé." msgstr ""
"Veuillez noter que pendant `git rebase` et `git pull --rebase`, `ours` et "
"`theirs` peuvent sembler échangés. Voir l'explication des mêmes options dans "
"linkgit:git-checkout[1] pour plus de détails."
   
#. type: Plain text #. type: Plain text
#: en/git-restore.txt:89 #: en/git-restore.txt:89
#, fuzzy, priority:100 #, priority:100
#| msgid "When checking out paths from the index, this option lets you recreate the conflicted merge in the specified paths."
msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths." msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
msgstr "Lors de l'extraction de chemins depuis l'index, cette option vous permet de récréer la fusion en conflit dans les chemins spécifiés." msgstr ""
"Lors de la restauration de l'arbre de travail depuis l'index, récréer la "
"fusion en conflit dans les chemins non fusionnés."
   
#. type: Labeled list #. type: Labeled list
#: en/git-restore.txt:97 #: en/git-restore.txt:97
...@@ -43459,10 +43474,14 @@ msgstr "" ...@@ -43459,10 +43474,14 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-restore.txt:109 #: en/git-restore.txt:109
#, fuzzy, priority:100 #, priority:100
#| msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entries matched by <paths> and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and adds back any files in <paths>."
msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`." msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
msgstr "En mode d'extraction clairsemé, `git checkout -- <chemins>` mettrait seulement à jour les entrées correspondant à <chemins> et aux motifs clairsemés dans $GIT_DIR/info/sparse-checkout. Cette option ignore les motifs clairsemés et ré-ajoute tous les fichiers de <chemins>." msgstr ""
"En mode d'extraction clairsemé, le comportement par défaut met seulement à "
"jour les entrées correspondant à `<spécificateur-de-chemin>` et aux motifs "
"clairsemés dans $GIT_DIR/info/sparse-checkout. Cette option ignore les "
"motifs clairsemés et restaure tous les fichiers de `<spécificateur-de-"
"chemin>`."
   
#. type: Plain text #. type: Plain text
#: en/git-restore.txt:116 #: en/git-restore.txt:116
...@@ -43472,29 +43491,26 @@ msgstr "" ...@@ -43472,29 +43491,26 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-restore.txt:144 #: en/git-restore.txt:144
#, fuzzy, priority:100 #, priority:100
#| msgid "The following sequence checks out the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index." msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgstr "La séquence suivante extrait la branche `master`, ramène le fichier `Makefile` à deux révisions en arrière, supprime hello.c par erreur et le récupère de l'index." msgstr ""
"La séquence suivante bascule sur la branche `master`, ramène le fichier "
"`Makefile` à deux révisions en arrière, supprime hello.c par erreur et le "
"récupère de l'index."
   
#. type: delimited block - #. type: delimited block -
#: en/git-restore.txt:150 #: en/git-restore.txt:150
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid ""
#| "$ git checkout master <1>\n"
#| "$ git checkout master~2 Makefile <2>\n"
#| "$ rm -f hello.c\n"
#| "$ git checkout hello.c <3>\n"
msgid "" msgid ""
"$ git switch master\n" "$ git switch master\n"
"$ git restore --source master~2 Makefile <1>\n" "$ git restore --source master~2 Makefile <1>\n"
"$ rm -f hello.c\n" "$ rm -f hello.c\n"
"$ git restore hello.c <2>\n" "$ git restore hello.c <2>\n"
msgstr "" msgstr ""
"$ git checkout master <1>\n" "$ git switch master\n"
"$ git checkout master~2 Makefile <2>\n" "$ git restore --source master~2 Makefile <1>\n"
"$ rm -f hello.c\n" "$ rm -f hello.c\n"
"$ git checkout hello.c <3>\n" "$ git restore hello.c <2>\n"
   
#. type: Plain text #. type: Plain text
#: en/git-restore.txt:154 #: en/git-restore.txt:154
...@@ -43504,24 +43520,27 @@ msgstr "restaure hello.c depuis l'index" ...@@ -43504,24 +43520,27 @@ msgstr "restaure hello.c depuis l'index"
   
#. type: Plain text #. type: Plain text
#: en/git-restore.txt:157 #: en/git-restore.txt:157
#, fuzzy, priority:100 #, priority:100
#| msgid "If you want to check out _all_ C source files out of the index, you can say"
msgid "If you want to restore _all_ C source files to match the version in the index, you can say" msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
msgstr "Si vous souhaitez extraire _tous_ les fichiers source C de l'index, vous pouvez lancer" msgstr ""
"Si vous souhaitez restaurer _tous_ les fichiers source C pour correspondre à "
"la version de l'index, vous pouvez lancer"
   
#. type: delimited block - #. type: delimited block -
#: en/git-restore.txt:160 #: en/git-restore.txt:160
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "$ git checkout -- '*.c'\n"
msgid "$ git restore '*.c'\n" msgid "$ git restore '*.c'\n"
msgstr "$ git checkout -- '*.c'\n" msgstr "$ git restore '*.c'\n"
   
#. type: Plain text #. type: Plain text
#: en/git-restore.txt:166 #: en/git-restore.txt:166
#, fuzzy, priority:100 #, priority:100
#| msgid "Note the quotes around `*.c`. The file `hello.c` will also be checked out, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)." msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr "Notez les guillemets autour de `*.c`. Le fichier `hello.c` sera aussi extrait, même s'il n'est plus dans l'arbre de travail, parce que le patron de fichier est utilisé pour trouver les entrées dans l'index (et non dans l'arbre de travail par le shell)." msgstr ""
"Notez les guillemets autour de `*.c`. Le fichier `hello.c` sera aussi "
"restauré, même s'il n'est plus dans l'arbre de travail, parce que le patron "
"de fichier est utilisé pour trouver les entrées dans l'index (et non dans "
"l'arbre de travail par le shell)."
   
#. type: Plain text #. type: Plain text
#: en/git-restore.txt:168 #: en/git-restore.txt:168
...@@ -43531,10 +43550,9 @@ msgstr "" ...@@ -43531,10 +43550,9 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-restore.txt:171 #: en/git-restore.txt:171
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "$ git bisect reset\n"
msgid "$ git restore .\n" msgid "$ git restore .\n"
msgstr "$ git bisect reset\n" msgstr "$ git restore .\n"
   
#. type: Plain text #. type: Plain text
#: en/git-restore.txt:175 #: en/git-restore.txt:175
...@@ -43544,10 +43562,9 @@ msgstr "" ...@@ -43544,10 +43562,9 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-restore.txt:178 #: en/git-restore.txt:178
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "$ git bisect reset\n"
msgid "$ git restore :/\n" msgid "$ git restore :/\n"
msgstr "$ git bisect reset\n" msgstr "$ git restore :/\n"
   
#. type: Plain text #. type: Plain text
#: en/git-restore.txt:182 #: en/git-restore.txt:182
...@@ -43557,10 +43574,9 @@ msgstr "" ...@@ -43557,10 +43574,9 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-restore.txt:185 #: en/git-restore.txt:185
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "$ git checkout -- hello.c\n"
msgid "$ git restore --staged hello.c\n" msgid "$ git restore --staged hello.c\n"
msgstr "$ git checkout -- hello.c\n" msgstr "$ git restore --staged hello.c\n"
   
#. type: Plain text #. type: Plain text
#: en/git-restore.txt:189 #: en/git-restore.txt:189
...@@ -43582,10 +43598,9 @@ msgstr "" ...@@ -43582,10 +43598,9 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-restore.txt:198 #: en/git-restore.txt:198
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "$ git checkout -- hello.c\n"
msgid "$ git restore -s@ -SW hello.c\n" msgid "$ git restore -s@ -SW hello.c\n"
msgstr "$ git checkout -- hello.c\n" msgstr "$ git restore -s@ -SW hello.c\n"
   
#. type: Plain text #. type: Plain text
#: en/git-restore.txt:204 #: en/git-restore.txt:204
...@@ -43705,16 +43720,16 @@ msgstr "git-rev-list(1)" ...@@ -43705,16 +43720,16 @@ msgstr "git-rev-list(1)"
   
#. type: Plain text #. type: Plain text
#: en/git-rev-list.txt:7 #: en/git-rev-list.txt:7
#, fuzzy, priority:100 #, priority:100
msgid "git-rev-list - Lists commit objects in reverse chronological order" msgid "git-rev-list - Lists commit objects in reverse chronological order"
msgstr "Afficher les objets commit dans l'ordre chronologique inverse" msgstr ""
"git-rev-list - Affiche les objets commit dans l'ordre chronologique inverse"
   
#. type: Plain text #. type: Plain text
#: en/git-rev-list.txt:13 #: en/git-rev-list.txt:13
#, fuzzy, ignore-ellipsis, no-wrap, priority:100 #, ignore-ellipsis, no-wrap, priority:100
#| msgid "'git diff' [<options>] <commit> [--] [<path>...]"
msgid "'git rev-list' [<options>] <commit>... [[--] <path>...]\n" msgid "'git rev-list' [<options>] <commit>... [[--] <path>...]\n"
msgstr "'git diff' [<options>] <commit> [--] [<chemin>...]" msgstr "'git rev-list' [<options>] <commit> ...[[--] <chemin>...]\n"
   
#. type: Plain text #. type: Plain text
#: en/git-rev-list.txt:21 #: en/git-rev-list.txt:21
...@@ -44014,9 +44029,9 @@ msgstr "" ...@@ -44014,9 +44029,9 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-rev-parse.txt:129 #: en/git-rev-parse.txt:129
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
msgid "--short[=length]" msgid "--short[=length]"
msgstr "--short" msgstr "--short[=longueur]"
   
#. type: Plain text #. type: Plain text
#: en/git-rev-parse.txt:134 #: en/git-rev-parse.txt:134
...@@ -45349,9 +45364,9 @@ msgstr "" ...@@ -45349,9 +45364,9 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-send-email.txt:230 #: en/git-send-email.txt:230
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
msgid "--smtp-server-option=<option>" msgid "--smtp-server-option=<option>"
msgstr "--server-option=<option>" msgstr "--smtp-server-option=<option>"
   
#. type: Plain text #. type: Plain text
#: en/git-send-email.txt:234 #: en/git-send-email.txt:234
...@@ -46001,9 +46016,9 @@ msgstr "" ...@@ -46001,9 +46016,9 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-send-pack.txt:36 #: en/git-send-pack.txt:36
#, fuzzy, priority:100 #, priority:100
msgid "Same as --receive-pack=<git-receive-pack>." msgid "Same as --receive-pack=<git-receive-pack>."
msgstr "--receive-pack=<git-receive-pack>" msgstr "Identique à --receive-pack=<git-receive-pack>."
   
#. type: Plain text #. type: Plain text
#: en/git-send-pack.txt:40 #: en/git-send-pack.txt:40
...@@ -46103,9 +46118,10 @@ msgstr "git-shell(1)" ...@@ -46103,9 +46118,10 @@ msgstr "git-shell(1)"
   
#. type: Plain text #. type: Plain text
#: en/git-shell.txt:7 #: en/git-shell.txt:7
#, fuzzy, priority:100 #, priority:100
msgid "git-shell - Restricted login shell for Git-only SSH access" msgid "git-shell - Restricted login shell for Git-only SSH access"
msgstr "shell de login restreint pour un accès SSH vers Git seulement" msgstr ""
"git-shell - Shell de login restreint pour un accès SSH vers Git seulement"
   
#. type: Plain text #. type: Plain text
#: en/git-shell.txt:15 #: en/git-shell.txt:15
...@@ -46172,9 +46188,9 @@ msgstr "" ...@@ -46172,9 +46188,9 @@ msgstr ""
   
#. type: Title - #. type: Title -
#: en/git-shell.txt:44 #: en/git-shell.txt:44
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
msgid "INTERACTIVE USE" msgid "INTERACTIVE USE"
msgstr "MODE INTERACTIF" msgstr "UTILISATION INTERACTIVE"
   
#. type: Plain text #. type: Plain text
#: en/git-shell.txt:48 #: en/git-shell.txt:48
...@@ -46482,7 +46498,7 @@ msgstr "" ...@@ -46482,7 +46498,7 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-show-branch.txt:17 #: en/git-show-branch.txt:17
#, fuzzy, ignore-ellipsis, no-wrap, priority:100 #, ignore-ellipsis, no-wrap, priority:100
msgid "" msgid ""
"'git show-branch' [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" "'git show-branch' [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
...@@ -46491,10 +46507,12 @@ msgid "" ...@@ -46491,10 +46507,12 @@ msgid ""
"\t\t[(<rev> | <glob>)...]\n" "\t\t[(<rev> | <glob>)...]\n"
"'git show-branch' (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]\n" "'git show-branch' (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]\n"
msgstr "" msgstr ""
"git show-branch [-a | --all] [-r|--remotes] [--topo-order | --date-order]\n" "'git show-branch' [-a | --all] [-r|--remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<quand>] | --no-color] [--sparse]\n" "\t\t[--current] [--color[=<quand>] | --no-color] [--sparse]\n"
"\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
"\t\t[--no-name | --sha1-name] [--topics] [(<rév> | <glob>)...]" "\t\t[--no-name | --sha1-name] [--topics]\n"
"\t\t[(<rév> | <glob>)...]\n"
"'git show-branch' (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]\n"
   
#. type: Plain text #. type: Plain text
#: en/git-show-branch.txt:24 #: en/git-show-branch.txt:24
...@@ -46540,9 +46558,9 @@ msgstr "" ...@@ -46540,9 +46558,9 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-show-branch.txt:46 #: en/git-show-branch.txt:46
#, fuzzy, priority:100 #, priority:100
msgid "Show the remote-tracking branches." msgid "Show the remote-tracking branches."
msgstr "afficher les branches de suivi distantes" msgstr "Afficher les branches de suivi à distance."
   
#. type: Plain text #. type: Plain text
#: en/git-show-branch.txt:50 #: en/git-show-branch.txt:50
...@@ -46606,9 +46624,9 @@ msgstr "" ...@@ -46606,9 +46624,9 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-show-branch.txt:82 #: en/git-show-branch.txt:82
#, fuzzy, priority:100 #, priority:100
msgid "Synonym to `--more=-1`" msgid "Synonym to `--more=-1`"
msgstr "synonyme de more=-1" msgstr "synonyme de `--more=-1`"
   
#. type: Labeled list #. type: Labeled list
#: en/git-show-branch.txt:83 #: en/git-show-branch.txt:83
...@@ -46887,9 +46905,9 @@ msgstr "--head" ...@@ -46887,9 +46905,9 @@ msgstr "--head"
   
#. type: Plain text #. type: Plain text
#: en/git-show-ref.txt:39 #: en/git-show-ref.txt:39
#, fuzzy, priority:100 #, priority:100
msgid "Show the HEAD reference, even if it would normally be filtered out." msgid "Show the HEAD reference, even if it would normally be filtered out."
msgstr "afficher la référence HEAD, même si elle serait filtrée" msgstr "Afficher la référence HEAD, même si elle serait normalement filtrée."
   
#. type: Plain text #. type: Plain text
#: en/git-show-ref.txt:46 #: en/git-show-ref.txt:46
...@@ -47341,9 +47359,9 @@ msgstr "" ...@@ -47341,9 +47359,9 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-sh-setup.txt:55 #: en/git-sh-setup.txt:55
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
msgid "is_bare_repository" msgid "is_bare_repository"
msgstr "--is-bare-repository" msgstr "is_bare_repository"
   
#. type: Plain text #. type: Plain text
#: en/git-sh-setup.txt:59 #: en/git-sh-setup.txt:59
...@@ -47359,9 +47377,9 @@ msgstr "cd_to_toplevel" ...@@ -47359,9 +47377,9 @@ msgstr "cd_to_toplevel"
   
#. type: Plain text #. type: Plain text
#: en/git-sh-setup.txt:62 #: en/git-sh-setup.txt:62
#, fuzzy, priority:100 #, priority:100
msgid "runs chdir to the toplevel of the working tree." msgid "runs chdir to the toplevel of the working tree."
msgstr "Impossible de se placer dans le répertoire $cdup, la racine de la copie de travail" msgstr "se placer dans le répertoire à la racine de l'arbre de travail."
   
#. type: Labeled list #. type: Labeled list
#: en/git-sh-setup.txt:63 #: en/git-sh-setup.txt:63
...@@ -48659,9 +48677,11 @@ msgstr "--strip-comments" ...@@ -48659,9 +48677,11 @@ msgstr "--strip-comments"
   
#. type: Plain text #. type: Plain text
#: en/git-stripspace.txt:41 #: en/git-stripspace.txt:41
#, fuzzy, priority:100 #, priority:100
msgid "Skip and remove all lines starting with comment character (default '#')." msgid "Skip and remove all lines starting with comment character (default '#')."
msgstr "sauter et supprimer toutes les lignes commençant par le caractère de commentaire" msgstr ""
"Sauter et supprimer toutes les lignes commençant par le caractère de "
"commentaire (par défaut '#')."
   
#. type: Labeled list #. type: Labeled list
#: en/git-stripspace.txt:43 #: en/git-stripspace.txt:43
...@@ -49399,9 +49419,9 @@ msgstr "git-svn(1)" ...@@ -49399,9 +49419,9 @@ msgstr "git-svn(1)"
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:7 #: en/git-svn.txt:7
#, fuzzy, priority:100 #, priority:100
msgid "git-svn - Bidirectional operation between a Subversion repository and Git" msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
msgstr "Opération Bidirectionnelles entre un dépôt Subversion et Git" msgstr "git-svn - Opération Bidirectionnelles entre un dépôt Subversion et Git"
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:12 #: en/git-svn.txt:12
...@@ -50397,9 +50417,9 @@ msgstr "" ...@@ -50397,9 +50417,9 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-svn.txt:531 #: en/git-svn.txt:531
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
msgid "-r <n>" msgid "-r <n>"
msgstr "-j <n>" msgstr "-r <n>"
   
#. type: Labeled list #. type: Labeled list
#: en/git-svn.txt:532 #: en/git-svn.txt:532
...@@ -50480,9 +50500,9 @@ msgstr "" ...@@ -50480,9 +50500,9 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-svn.txt:577 #: en/git-svn.txt:577
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
msgid "--shared[=(false|true|umask|group|all|world|everybody)]" msgid "--shared[=(false|true|umask|group|all|world|everybody)]"
msgstr "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]" msgstr "--shared[=(false|true|umask|group|all|world|everybody)]"
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:581 #: en/git-svn.txt:581
...@@ -50590,9 +50610,9 @@ msgstr "" ...@@ -50590,9 +50610,9 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-svn.txt:636 #: en/git-svn.txt:636
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
msgid "-A<filename>" msgid "-A<filename>"
msgstr "-F <fichier>" msgstr "-A<fichier>"
   
#. type: Labeled list #. type: Labeled list
#: en/git-svn.txt:637 #: en/git-svn.txt:637
...@@ -50656,16 +50676,15 @@ msgstr "" ...@@ -50656,16 +50676,15 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-svn.txt:677 #: en/git-svn.txt:677
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
msgid "-s<strategy>" msgid "-s<strategy>"
msgstr "--strategy" msgstr "-s<strategie>"
   
#. type: Labeled list #. type: Labeled list
#: en/git-svn.txt:681 #: en/git-svn.txt:681
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "--preserve-merges"
msgid "--preserve-merges (DEPRECATED)" msgid "--preserve-merges (DEPRECATED)"
msgstr "--preserve-merges" msgstr "--preserve-merges (DÉCONSEILLÉ)"
   
#. type: Plain text #. type: Plain text
#: en/git-svn.txt:683 #: en/git-svn.txt:683
...@@ -51350,10 +51369,9 @@ msgstr "git-switch(1)" ...@@ -51350,10 +51369,9 @@ msgstr "git-switch(1)"
   
#. type: Plain text #. type: Plain text
#: en/git-switch.txt:7 #: en/git-switch.txt:7
#, fuzzy, priority:100 #, priority:100
#| msgid "switch branch"
msgid "git-switch - Switch branches" msgid "git-switch - Switch branches"
msgstr "bascule de branche" msgstr "git-switch - bascule de branche"
   
#. type: Plain text #. type: Plain text
#: en/git-switch.txt:15 #: en/git-switch.txt:15
...@@ -51391,9 +51409,9 @@ msgstr "" ...@@ -51391,9 +51409,9 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-switch.txt:39 #: en/git-switch.txt:39
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
msgid "<new-branch>" msgid "<new-branch>"
msgstr "<nouvelle_branche>" msgstr "<nouvelle-branche>"
   
#. type: Plain text #. type: Plain text
#: en/git-switch.txt:48 #: en/git-switch.txt:48
...@@ -51403,58 +51421,57 @@ msgstr "" ...@@ -51403,58 +51421,57 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-switch.txt:54 #: en/git-switch.txt:54
#, fuzzy, priority:100 #, priority:100
#| msgid "You can use the `\"@{-N}\"` syntax to refer to the N-th last branch/commit checked out using \"git checkout\" operation. You may also specify `-` which is synonymous to `\"@{-1}`."
msgid "You can use the `@{-N}` syntax to refer to the N-th last branch/commit switched to using \"git switch\" or \"git checkout\" operation. You may also specify `-` which is synonymous to `@{-1}`. This is often used to switch quickly between two branches, or to undo a branch switch by mistake." msgid "You can use the `@{-N}` syntax to refer to the N-th last branch/commit switched to using \"git switch\" or \"git checkout\" operation. You may also specify `-` which is synonymous to `@{-1}`. This is often used to switch quickly between two branches, or to undo a branch switch by mistake."
msgstr "Vous pouvez utiliser la syntaxe `\"@{-N}\"` pour faire référence à la N-ième dernière branche ou commit extrait en utilisant une opération « git checkout ». Vous pouvez aussi spécifier `-` qui est synonyme de `\"@{-1}\"`." msgstr ""
"Vous pouvez utiliser la syntaxe `@{-N}` pour faire référence à la N-ième "
"dernière branche ou commit sur lesquels on a basculé en utilisant une "
"opération « git switch » ou « git checkout ». Vous pouvez aussi spécifier `-`"
" qui est synonyme de `@{-1}`. C'est souvent utilisé pour basculer rapidement "
"entre deux branches ou pour annuler un basculement par erreur."
   
#. type: Labeled list #. type: Labeled list
#: en/git-switch.txt:59 #: en/git-switch.txt:59
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "-b <new-branch>"
msgid "-c <new-branch>" msgid "-c <new-branch>"
msgstr "-b <nouvelle-branche>" msgstr "-c <nouvelle-branche>"
   
#. type: Labeled list #. type: Labeled list
#: en/git-switch.txt:60 #: en/git-switch.txt:60
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "-b <new-branch>"
msgid "--create <new-branch>" msgid "--create <new-branch>"
msgstr "-b <nouvelle-branche>" msgstr "--create <nouvelle-branche>"
   
#. type: Plain text #. type: Plain text
#: en/git-switch.txt:64 #: en/git-switch.txt:64
#, fuzzy, priority:100 #, priority:100
#| msgid "Create a new branch named <new_branch> and start it at <start_point>; see linkgit:git-branch[1] for details."
msgid "Create a new branch named `<new-branch>` starting at `<start-point>` before switching to the branch. This is a convenient shortcut for:" msgid "Create a new branch named `<new-branch>` starting at `<start-point>` before switching to the branch. This is a convenient shortcut for:"
msgstr "Créer une nouvelle branche nommée <nouvelle_branche> et la commencer à <point_de_départ> ; voir linkgit:git-branch[1] pour plus de détails." msgstr ""
"Créer une nouvelle branche nommée `<nouvelle-branche>` commençant à `<point-"
"de-départ>` avant de basculer sur cette branche. C'est un raccourci pratique "
"pour :"
   
#. type: delimited block - #. type: delimited block -
#: en/git-switch.txt:68 #: en/git-switch.txt:68
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid ""
#| "$ git branch -f <branch> [<start point>]\n"
#| "$ git checkout <branch>\n"
msgid "" msgid ""
"$ git branch <new-branch>\n" "$ git branch <new-branch>\n"
"$ git switch <new-branch>\n" "$ git switch <new-branch>\n"
msgstr "" msgstr ""
"$ git branch -f <branche> [<point_de_départ>]\n" "$ git branch <nouvelle-branche>\n"
"$ git checkout <branche>\n" "$ git switch <nouvelle-branche>\n"
   
#. type: Labeled list #. type: Labeled list
#: en/git-switch.txt:70 #: en/git-switch.txt:70
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "-b <new-branch>"
msgid "-C <new-branch>" msgid "-C <new-branch>"
msgstr "-b <nouvelle-branche>" msgstr "-C <nouvelle-branche>"
   
#. type: Labeled list #. type: Labeled list
#: en/git-switch.txt:71 #: en/git-switch.txt:71
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "--orphan <new_branch>"
msgid "--force-create <new-branch>" msgid "--force-create <new-branch>"
msgstr "--orphan <nouvelle_branche>" msgstr "--force-create <nouvelle-branche>"
   
#. type: Plain text #. type: Plain text
#: en/git-switch.txt:75 #: en/git-switch.txt:75
...@@ -51464,16 +51481,13 @@ msgstr "" ...@@ -51464,16 +51481,13 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-switch.txt:79 #: en/git-switch.txt:79
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid ""
#| "$ git branch -f <branch> [<start point>]\n"
#| "$ git checkout <branch>\n"
msgid "" msgid ""
"$ git branch -f <new-branch>\n" "$ git branch -f <new-branch>\n"
"$ git switch <new-branch>\n" "$ git switch <new-branch>\n"
msgstr "" msgstr ""
"$ git branch -f <branche> [<point_de_départ>]\n" "$ git branch -f <nouvelle-branche>\n"
"$ git checkout <branche>\n" "$ git switch <nouvelle-branche>\n"
   
#. type: Plain text #. type: Plain text
#: en/git-switch.txt:86 #: en/git-switch.txt:86
...@@ -51483,10 +51497,9 @@ msgstr "" ...@@ -51483,10 +51497,9 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-switch.txt:95 #: en/git-switch.txt:95
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "$ git checkout -b <branch> --track <remote>/<branch>\n"
msgid "$ git switch -c <branch> --track <remote>/<branch>\n" msgid "$ git switch -c <branch> --track <remote>/<branch>\n"
msgstr "$ git checkout -b <branche> --track <distant>/<branche>\n" msgstr "$ git switch -c <branche> --track <distant>/<branche>\n"
   
#. type: Plain text #. type: Plain text
#: en/git-switch.txt:106 #: en/git-switch.txt:106
...@@ -51514,31 +51527,45 @@ msgstr "" ...@@ -51514,31 +51527,45 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-switch.txt:127 #: en/git-switch.txt:127
#, fuzzy, priority:100 #, priority:100
#| msgid "When switching branches, if you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context. However, with this option, a three-way merge between the current branch, your working tree contents, and the new branch is done, and you will be on the new branch."
msgid "If you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context. However, with this option, a three-way merge between the current branch, your working tree contents, and the new branch is done, and you will be on the new branch." msgid "If you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context. However, with this option, a three-way merge between the current branch, your working tree contents, and the new branch is done, and you will be on the new branch."
msgstr "Lors d'un basculement de branche, si vous avez des modifications locales sur un fichier ou plus qui sont différentes entre la branche actuelle et celle sur laquelle vous basculez, la commande refuse le basculement pour préserver vos modifications dans leur contexte. Cependant, avec cette option, une fusion à trois points entre la branche actuelle, le contenu de votre arbre de travail et la nouvelle branche est opérée et vous serez sur la nouvelle branche." msgstr ""
"Si vous avez des modifications locales sur un fichier ou plus qui sont "
"différentes entre la branche actuelle et celle sur laquelle vous basculez, "
"la commande refuse le basculement pour préserver vos modifications dans leur "
"contexte. Cependant, avec cette option, une fusion à trois points entre la "
"branche actuelle, le contenu de votre arbre de travail et la nouvelle "
"branche est opérée et vous serez sur la nouvelle branche."
   
#. type: Plain text #. type: Plain text
#: en/git-switch.txt:156 #: en/git-switch.txt:156
#, fuzzy, priority:100 #, priority:100
#| msgid "When creating a new branch, set up \"upstream\" configuration. See \"--track\" in linkgit:git-branch[1] for details."
msgid "When creating a new branch, set up \"upstream\" configuration. `-c` is implied. See `--track` in linkgit:git-branch[1] for details." msgid "When creating a new branch, set up \"upstream\" configuration. `-c` is implied. See `--track` in linkgit:git-branch[1] for details."
msgstr "À la création d'une nouvelle branche, établir la configuration 'upstream' (branche amont). Voir `--track` dans linkgit:git-branch[1] pour plus de détails." msgstr ""
"À la création d'une nouvelle branche, établir la configuration 'upstream' ("
"branche amont). `-c` est implicite. Voir `--track` dans linkgit:git-branch[1]"
" pour plus de détails."
   
#. type: Plain text #. type: Plain text
#: en/git-switch.txt:166 #: en/git-switch.txt:166
#, fuzzy, priority:100 #, priority:100
#| msgid "If no `-b` option is given, the name of the new branch will be derived from the remote-tracking branch, by looking at the local part of the refspec configured for the corresponding remote, and then stripping the initial part up to the \"*\". This would tell us to use \"hack\" as the local branch when branching off of \"origin/hack\" (or \"remotes/origin/hack\", or even \"refs/remotes/origin/hack\"). If the given name has no slash, or the above guessing results in an empty name, the guessing is aborted. You can explicitly give a name with `-b` in such a case."
msgid "If no `-c` option is given, the name of the new branch will be derived from the remote-tracking branch, by looking at the local part of the refspec configured for the corresponding remote, and then stripping the initial part up to the \"*\". This would tell us to use `hack` as the local branch when branching off of `origin/hack` (or `remotes/origin/hack`, or even `refs/remotes/origin/hack`). If the given name has no slash, or the above guessing results in an empty name, the guessing is aborted. You can explicitly give a name with `-c` in such a case." msgid "If no `-c` option is given, the name of the new branch will be derived from the remote-tracking branch, by looking at the local part of the refspec configured for the corresponding remote, and then stripping the initial part up to the \"*\". This would tell us to use `hack` as the local branch when branching off of `origin/hack` (or `remotes/origin/hack`, or even `refs/remotes/origin/hack`). If the given name has no slash, or the above guessing results in an empty name, the guessing is aborted. You can explicitly give a name with `-c` in such a case."
msgstr "Si aucune option `-b` n'est fournie, le nom de la nouvelle branche sera dérivé de la branche de suivi à distance, en regardant la partie locale de la spécification de référence configurée pour le distant correspondant et en enlevant la partie initiale jusqu'au \"*\". Cela indiquerait d'utiliser le nom « hack » comme branche locale créée à partir de « origin/hack » (ou « remotes/origin/hack », ou même « refs/remotes/origin/hack »). Si le nom fourni ne contient pas de barre oblique, ou si le résultat de la dérivation est un nom vide, la dérivation échoue. Vous pouvez spécifier explicitement un nom avec `-b` dans ce cas." msgstr ""
"Si aucune option `-c` n'est fournie, le nom de la nouvelle branche sera "
"dérivé de la branche de suivi à distance, en regardant la partie locale de "
"la spécification de référence configurée pour le distant correspondant et en "
"enlevant la partie initiale jusqu'au \"*\". Cela indiquerait d'utiliser le "
"nom `hack` comme branche locale créée à partir de `origin/hack` (ou `remotes/"
"origin/hack`, ou même `refs/remotes/origin/hack`). Si le nom fourni ne "
"contient pas de barre oblique, ou si le résultat de la dérivation est un nom "
"vide, la dérivation échoue. Vous pouvez spécifier explicitement un nom avec "
"`-c` dans ce cas."
   
#. type: Labeled list #. type: Labeled list
#: en/git-switch.txt:171 #: en/git-switch.txt:171
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "--orphan <new_branch>"
msgid "--orphan <new-branch>" msgid "--orphan <new-branch>"
msgstr "--orphan <nouvelle_branche>" msgstr "--orphan <nouvelle-branche>"
   
#. type: Plain text #. type: Plain text
#: en/git-switch.txt:174 #: en/git-switch.txt:174
...@@ -51548,17 +51575,24 @@ msgstr "" ...@@ -51548,17 +51575,24 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-switch.txt:180 #: en/git-switch.txt:180
#, fuzzy, priority:100 #, priority:100
#| msgid "`git checkout` refuses when the wanted ref is already checked out by another worktree. This option makes it check the ref out anyway. In other words, the ref can be held by more than one worktree."
msgid "`git switch` refuses when the wanted ref is already checked out by another worktree. This option makes it check the ref out anyway. In other words, the ref can be held by more than one worktree." msgid "`git switch` refuses when the wanted ref is already checked out by another worktree. This option makes it check the ref out anyway. In other words, the ref can be held by more than one worktree."
msgstr "`git checkout` échoue quand la référence voulue est déjà extraite dans un autre arbre de travail. Cette option force l'extraction. En d'autres termes, la réf peut être tenue par plus d'un arbre de travail." msgstr ""
"`git switch` échoue quand la référence voulue est déjà extraite dans un "
"autre arbre de travail. Cette option force l'extraction. En d'autres termes, "
"la réf peut être tenue par plus d'un arbre de travail."
   
#. 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 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 the submodules HEAD."
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 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."
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], 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 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."
   
#. type: Plain text #. type: Plain text
#: en/git-switch.txt:194 #: en/git-switch.txt:194
...@@ -51568,49 +51602,44 @@ msgstr "" ...@@ -51568,49 +51602,44 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-switch.txt:197 #: en/git-switch.txt:197
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "$ git checkout master\n"
msgid "$ git switch master\n" msgid "$ git switch master\n"
msgstr "$ git checkout master\n" msgstr "$ git switch master\n"
   
#. type: delimited block - #. type: delimited block -
#: en/git-switch.txt:204 #: en/git-switch.txt:204
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "$ git checkout mytopic\n"
msgid "$ git switch mytopic\n" msgid "$ git switch mytopic\n"
msgstr "$ git checkout monsujet\n" msgstr "$ git switch monsujet\n"
   
#. type: Plain text #. type: Plain text
#: en/git-switch.txt:209 #: en/git-switch.txt:209
#, fuzzy, priority:100 #, priority:100
#| 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 switch 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 switch would fail like this:"
msgstr "Cependant, votre « fausse » branche et votre branche correcte « monsujet » peuvent être différentes par les fichiers que vous avez modifiés localement, auquel cas l'extraction ci-dessus échouerait comme ceci :" msgstr ""
"Cependant, votre « fausse » branche et votre branche correcte « monsujet » "
"peuvent être différentes par les fichiers que vous avez modifiés localement, "
"auquel cas le basculement ci-dessus échouerait comme ceci :"
   
#. type: delimited block - #. type: delimited block -
#: en/git-switch.txt:213 #: en/git-switch.txt:213
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid ""
#| "$ git checkout mytopic\n"
#| "error: You have local changes to 'frotz'; not switching branches.\n"
msgid "" msgid ""
"$ git switch mytopic\n" "$ git switch mytopic\n"
"error: You have local changes to 'frotz'; not switching branches.\n" "error: You have local changes to 'frotz'; not switching branches.\n"
msgstr "" msgstr ""
"$ git checkout monsujet\n" "$ git switch monsujet\n"
"error: Vos modifications locales aux fichiers suivants seraient écrasées par l'extraction :\n" "error : Vos modifications locales aux fichiers suivants seraient écrasées "
"par l'extraction :\n"
   
#. type: delimited block - #. type: delimited block -
#: en/git-switch.txt:221 #: en/git-switch.txt:221
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid ""
#| "$ git checkout -m mytopic\n"
#| "Auto-merging frotz\n"
msgid "" msgid ""
"$ git switch -m mytopic\n" "$ git switch -m mytopic\n"
"Auto-merging frotz\n" "Auto-merging frotz\n"
msgstr "" msgstr ""
"$ git checkout -m monsujet\n" "$ git switch -m monsujet\n"
"Fusion automatique de frotz\n" "Fusion automatique de frotz\n"
   
#. type: Plain text #. type: Plain text
...@@ -51621,10 +51650,9 @@ msgstr "" ...@@ -51621,10 +51650,9 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-switch.txt:232 #: en/git-switch.txt:232
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "$ git fetch origin\n"
msgid "$ git switch -\n" msgid "$ git switch -\n"
msgstr "$ git fetch origin\n" msgstr "$ git switch -\n"
   
#. type: Plain text #. type: Plain text
#: en/git-switch.txt:236 #: en/git-switch.txt:236
...@@ -51642,10 +51670,11 @@ msgstr "" ...@@ -51642,10 +51670,11 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-switch.txt:244 #: en/git-switch.txt:244
#, fuzzy, priority:100 #, priority:100
#| msgid "Do not attempt to create a branch if a remote tracking branch of the same name exists."
msgid "If you want to start a new branch from a remote branch of the same name:" msgid "If you want to start a new branch from a remote branch of the same name:"
msgstr "Ne pas essayer de créer une branche si une branche de suivi à distance du même nom existe." msgstr ""
"Si vous souhaitez démarrer une branche nouvelle depuis une branche distante "
"du même nom :"
   
#. type: delimited block - #. type: delimited block -
#: en/git-switch.txt:249 #: en/git-switch.txt:249
...@@ -52319,7 +52348,7 @@ msgstr "" ...@@ -52319,7 +52348,7 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git.txt:18 #: en/git.txt:18
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
msgid "" msgid ""
"'git' [--version] [--help] [-C <path>] [-c <name>=<value>]\n" "'git' [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
...@@ -52328,11 +52357,12 @@ msgid "" ...@@ -52328,11 +52357,12 @@ msgid ""
" [--super-prefix=<path>]\n" " [--super-prefix=<path>]\n"
" <command> [<args>]\n" " <command> [<args>]\n"
msgstr "" msgstr ""
"git [--version] [--help] [-C <chemin>] [-c <nom>=<valeur>]\n" "'git' [--version] [--help] [-C <chemin>] [-c <nom>=<valeur>]\n"
" [--exec-path[=<chemin>]] [--html-path] [--man-path] [--info-path]\n" " [--exec-path[=<chemin>]] [--html-path] [--man-path] [--info-path]\n"
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n"
" [--git-dir=<chemin>] [--work-tree=<chemin>] [--namespace=<nom>]\n" " [--git-dir=<chemin>] [--work-tree=<chemin>] [--namespace=<nom>]\n"
" <commande> [<args>]" " [--super-prefix=<path>]\n"
" <commande> [<args>]\n"
   
#. type: Plain text #. type: Plain text
#: en/git.txt:24 #: en/git.txt:24
...@@ -52404,9 +52434,9 @@ msgstr "" ...@@ -52404,9 +52434,9 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git.txt:71 #: en/git.txt:71
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
msgid "-c <name>=<value>" msgid "-c <name>=<value>"
msgstr "-c <clé>=<valeur>" msgstr "-c <nom>=<valeur>"
   
#. type: Plain text #. type: Plain text
#: en/git.txt:76 #: en/git.txt:76
...@@ -52542,9 +52572,11 @@ msgstr "" ...@@ -52542,9 +52572,11 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git.txt:139 #: en/git.txt:139
#, fuzzy, priority:100 #, priority:100
msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory." msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory."
msgstr "Créer un dépôt nu. Si l'environnement `GIT_DIR` n'est pas défini, alors il est défini au répertoire de travail courant." msgstr ""
"Traiter le dépôt comme un dépôt nu. Si l'environnement `GIT_DIR` n'est pas "
"défini, alors il est défini au répertoire de travail courant."
   
#. type: Labeled list #. type: Labeled list
#: en/git.txt:140 #: en/git.txt:140
...@@ -52656,7 +52688,7 @@ msgstr "" ...@@ -52656,7 +52688,7 @@ msgstr ""
   
#. type: Title ~ #. type: Title ~
#: en/git.txt:192 #: en/git.txt:192
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
msgid "Main porcelain commands" msgid "Main porcelain commands"
msgstr "Commandes Porcelaine Principales" msgstr "Commandes Porcelaine Principales"
   
...@@ -53023,9 +53055,12 @@ msgstr "`GIT_OBJECT_DIRECTORY`" ...@@ -53023,9 +53055,12 @@ msgstr "`GIT_OBJECT_DIRECTORY`"
   
#. type: Plain text #. type: Plain text
#: en/git.txt:419 #: en/git.txt:419
#, fuzzy, priority:100 #, priority:100
msgid "If the object storage directory is specified via this 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 this environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr "Si le répertoire de stockage d'objets est spécifié via la variable d'environnement `$GIT_OBJECT_DIRECTORY`, alors les répertoires sha1 sont créés dedans - sinon le répertoire par défaut `$GIT_DIR/objects` est utilisé." msgstr ""
"Si le répertoire de stockage d'objets est spécifié via cette variable "
"d'environnement, alors les répertoires sha1 sont créés dedans - sinon le "
"répertoire par défaut `$GIT_DIR/objects` est utilisé."
   
#. type: Labeled list #. type: Labeled list
#: en/git.txt:420 #: en/git.txt:420
...@@ -55144,9 +55179,9 @@ msgstr "" ...@@ -55144,9 +55179,9 @@ msgstr ""
   
#. type: Title - #. type: Title -
#: en/git-update-ref.txt:124 #: en/git-update-ref.txt:124
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
msgid "LOGGING UPDATES" msgid "LOGGING UPDATES"
msgstr "ÉDITER LES CORRECTIFS" msgstr "MISES À JOUR DU JOURNAL"
   
#. type: Plain text #. type: Plain text
#: en/git-update-ref.txt:131 #: en/git-update-ref.txt:131
...@@ -55204,10 +55239,9 @@ msgstr "" ...@@ -55204,10 +55239,9 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-update-server-info.txt:13 #: en/git-update-server-info.txt:13
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "git-update-server-info(1)"
msgid "'git update-server-info'\n" msgid "'git update-server-info'\n"
msgstr "git-update-server-info(1)" msgstr "'git update-server-info'\n"
   
#. type: Plain text #. type: Plain text
#: en/git-update-server-info.txt:21 #: en/git-update-server-info.txt:21
...@@ -55351,15 +55385,17 @@ msgstr "--[no-]strict" ...@@ -55351,15 +55385,17 @@ msgstr "--[no-]strict"
   
#. type: Plain text #. type: Plain text
#: en/git-upload-pack.txt:30 #: en/git-upload-pack.txt:30
#, fuzzy, priority:100 #, priority:100
msgid "Do not try <directory>/.git/ if <directory> is no Git directory." msgid "Do not try <directory>/.git/ if <directory> is no Git directory."
msgstr "nes pas essayer <répertoire>/.git/ si <répertoire> n'est pas un répertoire Git" msgstr ""
"Ne pas essayer <répertoire>/.git/ si <répertoire> n'est pas un répertoire "
"Git."
   
#. type: Plain text #. type: Plain text
#: en/git-upload-pack.txt:33 #: en/git-upload-pack.txt:33
#, fuzzy, priority:100 #, priority:100
msgid "Interrupt transfer after <n> seconds of inactivity." msgid "Interrupt transfer after <n> seconds of inactivity."
msgstr "interrompre le transfert après <n> secondes d'inactivité" msgstr "Interrompre le transfert après <n> secondes d'inactivité."
   
#. type: Labeled list #. type: Labeled list
#: en/git-upload-pack.txt:34 #: en/git-upload-pack.txt:34
...@@ -55417,9 +55453,9 @@ msgstr "" ...@@ -55417,9 +55453,9 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-var.txt:17 #: en/git-var.txt:17
#, fuzzy, priority:100 #, priority:100
msgid "Prints a Git logical variable." msgid "Prints a Git logical variable."
msgstr "Afficher un variable logique de Git" msgstr "Afficher un variable logique de Git."
   
#. type: Plain text #. type: Plain text
#: en/git-var.txt:25 #: en/git-var.txt:25
...@@ -55437,9 +55473,9 @@ msgstr "" ...@@ -55437,9 +55473,9 @@ msgstr ""
   
#. type: Title - #. type: Title -
#: en/git-var.txt:33 #: en/git-var.txt:33
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
msgid "VARIABLES" msgid "VARIABLES"
msgstr "VARIABLES D'ENVIRONNEMENT" msgstr "VARIABLES"
   
#. type: Labeled list #. type: Labeled list
#: en/git-var.txt:34 #: en/git-var.txt:34
...@@ -55563,9 +55599,9 @@ msgstr "" ...@@ -55563,9 +55599,9 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-verify-pack.txt:13 #: en/git-verify-pack.txt:13
#, fuzzy, ignore-ellipsis, no-wrap, priority:100 #, ignore-ellipsis, no-wrap, priority:100
msgid "'git verify-pack' [-v|--verbose] [-s|--stat-only] [--] <pack>.idx ...\n" msgid "'git verify-pack' [-v|--verbose] [-s|--stat-only] [--] <pack>.idx ...\n"
msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "'git verify-pack' [-v | --verbose] [-s | --stat-only] <paquet>.idx...\n"
   
#. type: Plain text #. type: Plain text
#: en/git-verify-pack.txt:20 #: en/git-verify-pack.txt:20
...@@ -56537,9 +56573,9 @@ msgstr "git-write-tree - Crée un objet arbre depuis l'index actuel" ...@@ -56537,9 +56573,9 @@ msgstr "git-write-tree - Crée un objet arbre depuis l'index actuel"
   
#. type: Plain text #. type: Plain text
#: en/git-write-tree.txt:13 #: en/git-write-tree.txt:13
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n" msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n"
msgstr "git write-tree [--missing-ok] [--prefix=<préfixe>/]" msgstr "'git write-tree' [--missing-ok] [--prefix=<préfixe>/]\n"
   
#. type: Plain text #. type: Plain text
#: en/git-write-tree.txt:18 #: en/git-write-tree.txt:18
...@@ -56597,10 +56633,12 @@ msgstr "" ...@@ -56597,10 +56633,12 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/gitglossary.txt:24 #: en/gitglossary.txt:24
#, fuzzy, priority:100 #, priority:100
#| msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]" msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
msgstr "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]" msgstr ""
"linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7]"
", linkgit:giteveryday[7], link:user-manual.html[Le manuel d'utilisateur de "
"Git]"
   
#. type: Labeled list #. type: Labeled list
#: en/glossary-content.txt:1 #: en/glossary-content.txt:1
...@@ -56640,10 +56678,9 @@ msgstr "" ...@@ -56640,10 +56678,9 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/glossary-content.txt:20 #: en/glossary-content.txt:20
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "--branch <branch>"
msgid "[[def_branch]]branch" msgid "[[def_branch]]branch"
msgstr "--branch <branche>" msgstr "[[def_branch]]branche"
   
#. type: Plain text #. type: Plain text
#: en/glossary-content.txt:30 #: en/glossary-content.txt:30
...@@ -56821,10 +56858,9 @@ msgstr "" ...@@ -56821,10 +56858,9 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/glossary-content.txt:132 #: en/glossary-content.txt:132
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "--subdirectory-filter <directory>"
msgid "[[def_directory]]directory" msgid "[[def_directory]]directory"
msgstr "--subdirectory-filter <répertoire>" msgstr "[[def_directory]]répertoire"
   
#. type: Plain text #. type: Plain text
#: en/glossary-content.txt:134 #: en/glossary-content.txt:134
...@@ -57230,10 +57266,9 @@ msgstr "" ...@@ -57230,10 +57266,9 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/glossary-content.txt:355 #: en/glossary-content.txt:355
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "--stop"
msgid "top" msgid "top"
msgstr "--stop" msgstr "top"
   
#. type: Plain text #. type: Plain text
#: en/glossary-content.txt:359 #: en/glossary-content.txt:359
...@@ -57243,10 +57278,9 @@ msgstr "" ...@@ -57243,10 +57278,9 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/glossary-content.txt:360 #: en/glossary-content.txt:360
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "--literally"
msgid "literal" msgid "literal"
msgstr "--literally" msgstr "literal"
   
#. type: Plain text #. type: Plain text
#: en/glossary-content.txt:363 #: en/glossary-content.txt:363
...@@ -57268,10 +57302,9 @@ msgstr "" ...@@ -57268,10 +57302,9 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/glossary-content.txt:367 #: en/glossary-content.txt:367
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "--global"
msgid "glob" msgid "glob"
msgstr "--global" msgstr "glob"
   
#. type: Plain text #. type: Plain text
#: en/glossary-content.txt:374 #: en/glossary-content.txt:374
...@@ -57365,10 +57398,9 @@ msgstr "" ...@@ -57365,10 +57398,9 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/glossary-content.txt:419 #: en/glossary-content.txt:419
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "--include"
msgid "exclude" msgid "exclude"
msgstr "--include" msgstr "exclude"
   
#. type: Plain text #. type: Plain text
#: en/glossary-content.txt:425 #: en/glossary-content.txt:425
...@@ -57546,10 +57578,9 @@ msgstr "" ...@@ -57546,10 +57578,9 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/glossary-content.txt:528 #: en/glossary-content.txt:528
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "The URL to the remote repository."
msgid "[[def_remote]]remote repository" msgid "[[def_remote]]remote repository"
msgstr "L'URL du dépôt distant." msgstr "[[def_remote]]dépôt distant"
   
#. type: Plain text #. type: Plain text
#: en/glossary-content.txt:532 #: en/glossary-content.txt:532
...@@ -57559,9 +57590,9 @@ msgstr "" ...@@ -57559,9 +57590,9 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/glossary-content.txt:533 #: en/glossary-content.txt:533
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
msgid "[[def_remote_tracking_branch]]remote-tracking branch" msgid "[[def_remote_tracking_branch]]remote-tracking branch"
msgstr "agir sur les branches de suivi distantes" msgstr "[[def_remote_tracking_branch]]branche de suivi à distance"
   
#. type: Plain text #. type: Plain text
#: en/glossary-content.txt:541 #: en/glossary-content.txt:541
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

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