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

Merge branch 'pre-translate-fr'

parents b90323e5 3029da58
No related branches found
No related tags found
No related merge requests found
...@@ -264,10 +264,9 @@ msgstr "" ...@@ -264,10 +264,9 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/blame-options.txt:125 #: en/blame-options.txt:125
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
#| msgid "--signature-file=<file>"
msgid "--ignore-revs-file <file>" msgid "--ignore-revs-file <file>"
msgstr "--signature-file=<fichier>" msgstr "--ignore-revs-file <fichier>"
   
#. type: Plain text #. type: Plain text
#: en/blame-options.txt:131 #: en/blame-options.txt:131
...@@ -3692,19 +3691,19 @@ msgstr "" ...@@ -3692,19 +3691,19 @@ msgstr ""
#: en/diff-options.txt:47 #: en/diff-options.txt:47
#, no-wrap, priority:280 #, no-wrap, priority:280
msgid "--output-indicator-new=<char>" msgid "--output-indicator-new=<char>"
msgstr "" msgstr "--output-indicator-new=<caractère>"
   
#. type: Labeled list #. type: Labeled list
#: en/diff-options.txt:48 #: en/diff-options.txt:48
#, no-wrap, priority:280 #, no-wrap, priority:280
msgid "--output-indicator-old=<char>" msgid "--output-indicator-old=<char>"
msgstr "" msgstr "--output-indicator-old=<caractère>"
   
#. type: Labeled list #. type: Labeled list
#: en/diff-options.txt:49 #: en/diff-options.txt:49
#, no-wrap, priority:280 #, no-wrap, priority:280
msgid "--output-indicator-context=<char>" msgid "--output-indicator-context=<char>"
msgstr "" msgstr "--output-indicator-context=<caractère>"
   
#. type: Plain text #. type: Plain text
#: en/diff-options.txt:53 #: en/diff-options.txt:53
...@@ -10,7 +10,7 @@ msgstr "" ...@@ -10,7 +10,7 @@ msgstr ""
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
# Recurring French translations for Regex Search & Replace in Git Man pages. # Recurring French translations for Regex Search & Replace in Git Man pages.
...@@ -39,6 +39,9 @@ msgstr "\1num\2" ...@@ -39,6 +39,9 @@ msgstr "\1num\2"
msgid "(-{1,2}[a-zA-Z-]+?\[?[=\s]<)pattern(>\]?)" msgid "(-{1,2}[a-zA-Z-]+?\[?[=\s]<)pattern(>\]?)"
msgstr "\1motif\2" msgstr "\1motif\2"
msgid "(-{1,2}[a-zA-Z-]+?\[?[=\s]<)char(>\]?)"
msgstr "\1caractère\2"
msgid "(--[a-zA-Z-]+?=<)glob-pattern(>)" msgid "(--[a-zA-Z-]+?=<)glob-pattern(>)"
msgstr "\1motif-glob\2" msgstr "\1motif-glob\2"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment