[RFR2] po4a://manpages-fr/merge.1/po/fr.po
Bonjour,
le 05/08/25 16:17 Lucien a écrit :
>Un détail et des suggestions
⇒ patch
Merci d’avance pour vos relectures et commentaires.
Amicalement
--
Jean-Paul
# French translation of manpages
# This file is distributed under the same license as the manpages-l10n package.
# Copyright © of this file:
# Jean-Paul Guillonneau <guillonneau.jeanpaul@free.fr>, 2025.
msgid ""
msgstr ""
"Project-Id-Version: manpages-l10n\n"
"POT-Creation-Date: 2025-05-30 16:46+0200\n"
"PO-Revision-Date: 2025-08-06 08:05+0200\n"
"Last-Translator: Jean-Paul Guillonneau <guillonneau.jeanpaul@free.fr>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Gvim\n"
#. type: ds Rv
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
#, no-wrap
msgid "5.10.1"
msgstr "5.10.1"
#. type: ds Dt
#: archlinux
#, no-wrap
msgid "2022-02-03"
msgstr "3\\ février\\ 2022"
#. type: ds i
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
#, no-wrap
msgid "\\&\\s-1ISO\\s0"
msgstr "\\&\\s-1ISO\\s0"
#. type: ds r
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
#, no-wrap
msgid "\\&\\s-1RCS\\s0"
msgstr "\\&\\s-1RCS\\s0"
#. type: ds u
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
#, no-wrap
msgid "\\&\\s-1UTC\\s0"
msgstr "\\&\\s-1UTC\\s0"
#. type: ds o
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
#, no-wrap
msgid "\\*r file"
msgstr "\\*r fichier"
#. type: TH
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
#, no-wrap
msgid "MERGE"
msgstr "MERGE"
#. type: TH
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
#, no-wrap
msgid "\\*(Dt"
msgstr "\\*(Dt"
#. type: TH
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
#, no-wrap
msgid "GNU RCS \\*(Rv"
msgstr "GNU RCS \\*(Rv"
#. type: SH
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
#, no-wrap
msgid "NAME"
msgstr "NOM"
#. type: Plain text
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
msgid "merge - three-way file merge"
msgstr "merge – Fusion de fichiers de trois façons"
#. type: SH
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
#, no-wrap
msgid "SYNOPSIS"
msgstr "SYNOPSIS"
#. type: Plain text
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
msgid "B<merge> [ I<options> ] I<file1 file2 file3>"
msgstr "B<merge> [ I<options> ] I<fichier1 fichier2 fichier3>"
#. type: SH
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
#, no-wrap
msgid "DESCRIPTION"
msgstr "DESCRIPTION"
#. type: Plain text
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
msgid ""
"B<merge> incorporates all changes that lead from I<file2> to I<file3> into "
"I<file1>. The result ordinarily goes into I<file1>. B<merge> is useful for "
"combining separate changes to an original. Suppose I<file2> is the "
"original, and both I<file1> and I<file3> are modifications of I<file2>. "
"Then B<merge> combines both changes."
msgstr ""
"B<merge> incorpore toutes les modifications qui mènent de I<fichier2> à "
"I<fichier3> dans I<fichier1>. Le résultat aboutit généralement dans "
"I<fichier1>. B<merge> est utile pour combiner des modifications "
"indépendantes dans un original. En supposant que l’original est I<fichier2> "
"et que I<fichier1> et I<fichier3> sont des modifications de I<fichier2>, "
"B<merge> combinera les deux modifications."
#. type: Plain text
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
msgid ""
"A conflict occurs if both I<file1> and I<file3> have changes in a common "
"segment of lines. If a conflict is found, B<merge> normally outputs a "
"warning and brackets the conflict with "
"B<E<lt>E<lt>E<lt>E<lt>E<lt>E<lt>E<lt>> and "
"B<E<gt>E<gt>E<gt>E<gt>E<gt>E<gt>E<gt>> lines. A typical conflict will look "
"like this:"
msgstr ""
"Un conflit se produit si I<fichier1> et I<fichier3> ont des modifications "
"dans un segment de lignes commun. Dans ce cas, B<merge> émettra normalement "
"un avertissement et encadrera les parties en conflit avec des lignes "
"B<E<lt>E<lt>E<lt>E<lt>E<lt>E<lt>E<lt>> et "
"B<E<gt>E<gt>E<gt>E<gt>E<gt>E<gt>E<gt>>. Un conflit typique ressemble à "
"ceci\\ :"
#. type: Plain text
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
#, no-wrap
msgid ""
"B<E<lt>E<lt>E<lt>E<lt>E<lt>E<lt>E<lt>>I< file A>\n"
"I<lines in file A>\n"
"B<=======>\n"
"I<lines in file B>\n"
"B<E<gt>E<gt>E<gt>E<gt>E<gt>E<gt>E<gt>>I< file B>\n"
msgstr ""
"B<E<lt>E<lt>E<lt>E<lt>E<lt>E<lt>E<lt>>I< fichier_A>\n"
"I<lignes dans fichier_A>\n"
"B<=======>\n"
"I<lignes dans fichier_B>\n"
"B<E<gt>E<gt>E<gt>E<gt>E<gt>E<gt>E<gt>>I< fichier_B>\n"
#. type: Plain text
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
msgid ""
"If there are conflicts, the user should edit the result and delete one of "
"the alternatives."
msgstr ""
"Si un conflit existe, l’utilisateur doit éditer le résultat et supprimer une "
"des alternatives."
#. type: SH
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
#, no-wrap
msgid "OPTIONS"
msgstr "OPTIONS"
#. type: TP
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
#, no-wrap
msgid "B<-A>"
msgstr "B<-A>"
#. type: Plain text
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
msgid ""
"Output conflicts using the B<-A> style of B<diff3>(1), if supported by "
"B<diff3>. This merges all changes leading from I<file2> to I<file3> into "
"I<file1>, and generates the most verbose output."
msgstr ""
"Afficher les conflits en utilisant le style B<-A> de B<diff3>(1), s’il est "
"pris en charge par B<diff3>. Cela fusionne toutes les modifications amenant "
"de I<fichier2> à I<fichier3> dans I<fichier1> et génère la sortie la plus "
"prolixe."
#. type: TP
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
#, no-wrap
msgid "B<-E>, B<-e>"
msgstr "B<-E>, B<-e>"
#. type: Plain text
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
msgid ""
"These options specify conflict styles that generate less information than B<-"
"A>. See B<diff3>(1) for details. The default is B<-E>. With B<-e>, "
"B<merge> does not warn about conflicts."
msgstr ""
"Ces options spécifient des styles d’indication de conflit qui génèrent moins "
"d’informations que l’option B<-A>. Consulter B<diff3>(1) pour plus "
"d’explications. L’option par défaut est B<-E>. Avec l’option B<-e>, "
"B<merge> n’avertit pas en cas de conflit."
#. type: TP
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
#, no-wrap
msgid "B<-L>I< label>"
msgstr "B<-L>I< étiquette>"
#. type: Plain text
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
msgid ""
"This option may be given up to three times, and specifies labels to be used "
"in place of the corresponding file names in conflict reports. That is, "
"B<merge\\ -L\\ x\\ -L\\ y\\ -L\\ z\\ a\\ b\\ c> generates output that looks "
"like it came from files B<x>, B<y> and B<z> instead of from files B<a>, B<b> "
"and B<c>."
msgstr ""
"Cette option peut être indiquée au plus trois fois et précise les étiquettes "
"à utiliser à la place des noms de fichier correspondants dans les rapports "
"de conflit. C’est-à-dire que B<merge\\ -L\\ x\\ -L\\ y\\ -L\\ z\\ a\\ b\\ c> "
"génère une sortie qui semble provenir des fichiers I<x>, I<y> et I<z> au "
"lieu des fichiers I<a>, I<b> et I<c>."
#. type: TP
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
#, no-wrap
msgid "B<-p>"
msgstr "B<-p>"
#. type: Plain text
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
msgid "Send results to standard output instead of overwriting I<file1>."
msgstr "Envoyer les résultats sur la sortie standard au lieu du I<fichier1>."
#. type: TP
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
#, no-wrap
msgid "B<-q>"
msgstr "B<-q>"
#. type: Plain text
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
msgid "Quiet; do not warn about conflicts."
msgstr "Motus, ne pas avertir en cas de conflit"
#. type: TP
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
#, no-wrap
msgid "B<-V>"
msgstr "B<-V>"
#. type: Plain text
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
msgid "Print \\*r's version number."
msgstr "Afficher le numéro de version de \\*r"
#. type: SH
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
#, no-wrap
msgid "DIAGNOSTICS"
msgstr "DIAGNOSTICS"
#. type: Plain text
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
msgid "Exit status is 0 for no conflicts, 1 for some conflicts, 2 for trouble."
msgstr ""
"Le code de retour est B<0> en l’absence de conflit, B<1> pour quelques "
"conflits et B<2> en cas de problèmes."
#. type: ds EY
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
#, no-wrap
msgid "1990, 1991, 1992, 1993, 1994, 1995"
msgstr "1990, 1991, 1992, 1993, 1994, 1995"
#. type: SH
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
#, no-wrap
msgid "IDENTIFICATION"
msgstr "IDENTIFICATION"
#. type: Plain text
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
msgid "Author: Walter F. Tichy."
msgstr "Auteur\\ : Walter F. Tichy."
#. type: Plain text
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
msgid "Manual Page Revision: \\*(Rv; Release Date: \\*(Dt."
msgstr ""
"Révision de la page de manuel\\ : \\*(Rv\\ ; date de publication\\ : \\*(Dt."
#. type: Plain text
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
msgid "Copyright \\(co 2010-2022 Thien-Thi Nguyen."
msgstr "Copyright \\(co 2010-2022 Thien-Thi Nguyen."
#. type: Plain text
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
msgid "Copyright \\(co \\*(EY Paul Eggert."
msgstr "Copyright \\(co \\*(EY Paul Eggert."
#. type: Plain text
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
msgid "Copyright \\(co 1982, 1988, 1989 Walter F. Tichy."
msgstr "Copyright \\(co 1982, 1988, 1989 Walter F. Tichy."
#. type: SH
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
#, no-wrap
msgid "SEE ALSO"
msgstr "VOIR AUSSI"
#. type: Plain text
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
msgid "B<diff3>(1), B<diff>(1), B<rcsmerge>(1), B<co>(1)."
msgstr "B<diff3>(1), B<diff>(1), B<rcsmerge>(1), B<co>(1)."
#. type: Plain text
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
msgid ""
"The full documentation for \\*r is maintained as a Texinfo manual. If the "
"B<info>(1) and \\*r programs are properly installed at your site, the "
"command"
msgstr ""
"La documentation complète de B<wdiff> est disponible dans un manuel Texinfo. "
"Si les programmes B<info> et B<wdiff> sont correctement installés, la "
"commande"
#. type: Plain text
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
msgid "B<info rcs>"
msgstr "B<info rcs>"
#. type: Plain text
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
msgid ""
"should give you access to the complete manual. Additionally, the \\*r "
"homepage:"
msgstr ""
"devrait vous donner accès au manuel complet. De plus, la page d’accueil de "
"\\*r\\ :"
#. type: Plain text
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
msgid "B<http://www.gnu.org/software/rcs/>"
msgstr "B<http://www.gnu.org/software/rcs/>"
#. type: Plain text
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
msgid "has news and links to the latest release, development site, etc."
msgstr ""
"fournit des nouvelles et des liens pour la dernière publication, le site de "
"développement,\\ etc."
#. type: SH
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
#, no-wrap
msgid "BUGS"
msgstr "BOGUES"
#. type: Plain text
#: archlinux debian-bookworm debian-unstable fedora-42 fedora-rawhide
#: mageia-cauldron opensuse-tumbleweed
msgid ""
"It normally does not make sense to merge binary files as if they were text, "
"but B<merge> tries to do it anyway."
msgstr ""
"Normalement, cela n’a aucun sens de fusionner des fichiers binaires comme "
"s’ils étaient composés de texte, mais B<merge> essaie quand même de le faire."
#. type: ds Dt
#: debian-bookworm
#, no-wrap
msgid "2022-02-19"
msgstr "19\\ février\\ 2022"
#. type: ds Dt
#: debian-unstable
#, no-wrap
msgid "2025-02-07"
msgstr "7\\ février\\ 2025"
#. type: ds Dt
#: fedora-42
#, no-wrap
msgid "2025-01-18"
msgstr "18\\ janvier\\ 2025"
#. type: ds Dt
#: fedora-rawhide
#, no-wrap
msgid "2025-05-10"
msgstr "10\\ mai\\ 2025"
#. type: ds Dt
#: mageia-cauldron
#, no-wrap
msgid "2022-08-17"
msgstr "17\\ août\\ 2022"
#. type: ds Dt
#: opensuse-tumbleweed
#, no-wrap
msgid "2024-10-01"
msgstr "1er\\ octobre\\ 2024"
Reply to: