From db470ae03a2a3bcb9c2cc1b0d35d32784f48e54b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr> Date: Tue, 15 Jan 2019 17:56:08 +0100 Subject: [PATCH] fr: merge imported translations from main git translations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jean-No챘l Avila <jn.avila@free.fr> --- po/documentation.fr.po | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/po/documentation.fr.po b/po/documentation.fr.po index 9f84ea7..8e92409 100644 --- a/po/documentation.fr.po +++ b/po/documentation.fr.po @@ -22107,7 +22107,7 @@ msgstr "" #. type: Plain text #: en/git-difftool.txt:138 msgid "Show changes between commits, commit and working tree, etc" -msgstr "" +msgstr "Afficher les changements entre les validations, entre validation et copie de travail, etc" #. type: Plain text #: en/git-difftool.txt:141 @@ -24359,7 +24359,7 @@ msgstr "" #: en/git-fast-import.txt:1057 en/git-fast-import.txt:1124 #, no-wrap msgid "force" -msgstr "" +msgstr "forcer" #. type: Plain text #: en/git-fast-import.txt:1061 @@ -24421,7 +24421,7 @@ msgstr "" #: en/git-fast-import.txt:1089 #, no-wrap msgid "done" -msgstr "" +msgstr "fait" #. type: Plain text #: en/git-fast-import.txt:1096 @@ -25341,7 +25341,7 @@ msgstr "" #: en/git-fetch.txt:149 en/git-push.txt:374 #, no-wrap msgid "reason" -msgstr "" +msgstr "raison" #. type: Plain text #: en/git-fetch.txt:153 @@ -26333,7 +26333,7 @@ msgstr "" #: en/git-for-each-ref.txt:126 #, no-wrap msgid "upstream" -msgstr "" +msgstr "amont" #. type: Plain text #: en/git-for-each-ref.txt:140 @@ -28770,7 +28770,7 @@ msgstr "" #: en/git-gui.txt:47 #, no-wrap msgid "version" -msgstr "" +msgstr "version" #. type: Plain text #: en/git-gui.txt:49 @@ -28880,7 +28880,7 @@ msgstr "" #: en/git-gui.txt:110 #, no-wrap msgid "Other" -msgstr "" +msgstr "Autre" #. type: Plain text #: en/git-gui.txt:114 @@ -34693,7 +34693,7 @@ msgstr "" #: en/git-p4.txt:165 #, no-wrap msgid "General options" -msgstr "" +msgstr "Options g챕n챕rales" #. type: Plain text #: en/git-p4.txt:167 @@ -36433,7 +36433,7 @@ msgstr "" #: en/git-pull.txt:97 #, no-wrap msgid "Options related to merging" -msgstr "" +msgstr "Options relatives 횪 la fusion" #. type: Labeled list #: en/git-pull.txt:104 @@ -36508,7 +36508,7 @@ msgstr "" #: en/git-pull.txt:141 #, no-wrap msgid "Options related to fetching" -msgstr "" +msgstr "Options relatives au rapatriement" #. type: Title - #: en/git-pull.txt:152 @@ -37586,7 +37586,7 @@ msgstr "" #: en/git-read-tree.txt:131 #, no-wrap msgid "Merging" -msgstr "" +msgstr "Fusion" #. type: Plain text #: en/git-read-tree.txt:136 @@ -45356,7 +45356,7 @@ msgstr "" #: en/git-stash.txt:168 en/git-update-ref.txt:100 #, no-wrap msgid "create" -msgstr "" +msgstr "cr챕er" #. type: Plain text #: en/git-stash.txt:174 @@ -51636,7 +51636,7 @@ msgstr "" #: en/git-update-ref.txt:104 #, no-wrap msgid "delete" -msgstr "" +msgstr "supprimer" #. type: Plain text #: en/git-update-ref.txt:107 @@ -51656,10 +51656,9 @@ msgstr "" #. type: Labeled list #: en/git-update-ref.txt:112 -#, fuzzy, no-wrap -#| msgid "status" +#, no-wrap msgid "option" -msgstr "status" +msgstr "option" #. type: Plain text #: en/git-update-ref.txt:116 -- GitLab