2014-11-25 13:30:33 +00:00
|
|
|
|
# translation of kompare.po to
|
|
|
|
|
# translation of kompare.po to Français
|
|
|
|
|
# traduction de kompare.po en français
|
|
|
|
|
# traduction de kompare.po en Français
|
|
|
|
|
# Copyright (C) 2003, 2004, 2005, 2008, 2009, 2010, 2012 Free Software Foundation, Inc.
|
|
|
|
|
# Gilles Caulier <caulier.gilles@free.fr>, 2002.
|
|
|
|
|
# Gilles Caulier <caulier.gilles@free.fr>, 2003.
|
|
|
|
|
# Gilles CAULIER <caulier.gilles@free.fr>, 2003.
|
|
|
|
|
# CAULIER Gilles <caulier.gilles@free.fr>, 2003.
|
|
|
|
|
# Matthieu Robin <kde@macolu.org>, 2004.
|
|
|
|
|
# Yann Verley <yann.verley@free.fr>, 2004, 2005.
|
|
|
|
|
# Matthieu Robin <kde@macolu.org>, 2004, 2005.
|
|
|
|
|
# Brice Rothschild <brice.rothschild@gmail.com>, 2005.
|
|
|
|
|
# Jean-Jacques FINAZZI <mrjay01@users.sourceforge.net>, 2008.
|
|
|
|
|
# Joëlle Cornavin <jcorn@free.fr>, 2009, 2010, 2012, 2013.
|
|
|
|
|
#
|
|
|
|
|
msgid ""
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Project-Id-Version: kompare\n"
|
2014-12-09 18:43:01 +00:00
|
|
|
|
"Report-Msgid-Bugs-To: xakepa10@gmail.com\n"
|
2021-06-27 14:09:08 +03:00
|
|
|
|
"POT-Creation-Date: 2021-06-27 14:01+0300\n"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
"PO-Revision-Date: 2012-07-10 10:13+0200\n"
|
|
|
|
|
"Last-Translator: Joëlle Cornavin <jcorn@free.fr>\n"
|
|
|
|
|
"Language-Team: French <kde-francophone@kde.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: Lokalize 1.4\n"
|
|
|
|
|
"X-Environment: kde\n"
|
|
|
|
|
"X-Accelerator-Marker: &\n"
|
|
|
|
|
"X-Text-Markup: kde4\n"
|
|
|
|
|
|
2021-03-28 14:32:36 +03:00
|
|
|
|
#. i18n: file: kompareui.rc:4
|
|
|
|
|
#. i18n: ectx: Menu (file)
|
|
|
|
|
#. i18n: file: komparepart/komparepartui.rc:4
|
|
|
|
|
#. i18n: ectx: Menu (file)
|
|
|
|
|
#: rc.cpp:3 rc.cpp:12
|
|
|
|
|
msgid "&File"
|
|
|
|
|
msgstr "&Fichier"
|
|
|
|
|
|
|
|
|
|
#. i18n: file: kompareui.rc:14
|
|
|
|
|
#. i18n: ectx: Menu (settings)
|
|
|
|
|
#. i18n: file: komparepart/komparepartui.rc:29
|
|
|
|
|
#. i18n: ectx: Menu (settings)
|
|
|
|
|
#: rc.cpp:6 rc.cpp:18
|
|
|
|
|
msgid "&Settings"
|
|
|
|
|
msgstr "&Configuration"
|
|
|
|
|
|
|
|
|
|
#. i18n: file: kompareui.rc:27
|
|
|
|
|
#. i18n: ectx: ToolBar (mainToolBar)
|
|
|
|
|
#: rc.cpp:9
|
|
|
|
|
msgid "Main Toolbar"
|
|
|
|
|
msgstr "Barre principale"
|
|
|
|
|
|
|
|
|
|
#. i18n: file: komparepart/komparepartui.rc:17
|
|
|
|
|
#. i18n: ectx: Menu (difference)
|
|
|
|
|
#: rc.cpp:15
|
|
|
|
|
msgid "&Difference"
|
|
|
|
|
msgstr "&Différences"
|
|
|
|
|
|
|
|
|
|
#. i18n: file: komparepart/komparesaveoptionsbase.ui:30
|
|
|
|
|
#. i18n: ectx: property (title), widget (QGroupBox, GroupBox2)
|
|
|
|
|
#: rc.cpp:21
|
|
|
|
|
msgid "Run Diff In"
|
|
|
|
|
msgstr "Effectuer l'analyse des différences dans"
|
|
|
|
|
|
|
|
|
|
#. i18n: file: komparepart/komparesaveoptionsbase.ui:65
|
|
|
|
|
#. i18n: ectx: property (title), widget (QGroupBox, m_CommandLineGB)
|
|
|
|
|
#: rc.cpp:24
|
|
|
|
|
msgid "Command Line"
|
|
|
|
|
msgstr "Ligne de commande"
|
|
|
|
|
|
|
|
|
|
#. i18n: file: komparepart/komparesaveoptionsbase.ui:80
|
|
|
|
|
#. i18n: ectx: property (text), widget (QLabel, m_CommandLineLabel)
|
|
|
|
|
#: rc.cpp:27
|
|
|
|
|
msgid "cd dir && diff -udHprNa -- source destination"
|
|
|
|
|
msgstr "cd dir && diff -udHprNa -- source destination"
|
|
|
|
|
|
|
|
|
|
#. i18n: file: komparepart/komparesaveoptionsbase.ui:93
|
|
|
|
|
#. i18n: ectx: property (title), widget (QGroupBox, m_OptionsGB)
|
|
|
|
|
#: rc.cpp:30 libdialogpages/diffpage.cpp:357
|
|
|
|
|
msgid "Options"
|
|
|
|
|
msgstr "Options"
|
|
|
|
|
|
|
|
|
|
#. i18n: file: komparepart/komparesaveoptionsbase.ui:105
|
|
|
|
|
#. i18n: ectx: property (text), widget (QCheckBox, m_SmallerChangesCB)
|
|
|
|
|
#: rc.cpp:33
|
|
|
|
|
msgid "Look for smaller changes"
|
|
|
|
|
msgstr "Chercher des modifications moins importantes"
|
|
|
|
|
|
|
|
|
|
#. i18n: file: komparepart/komparesaveoptionsbase.ui:115
|
|
|
|
|
#. i18n: ectx: property (text), widget (QCheckBox, m_LargeFilesCB)
|
|
|
|
|
#: rc.cpp:36
|
|
|
|
|
msgid "Optimize for large files"
|
|
|
|
|
msgstr "Optimiser pour les gros fichiers"
|
|
|
|
|
|
|
|
|
|
#. i18n: file: komparepart/komparesaveoptionsbase.ui:125
|
|
|
|
|
#. i18n: ectx: property (text), widget (QCheckBox, m_IgnoreCaseCB)
|
|
|
|
|
#: rc.cpp:39
|
|
|
|
|
msgid "Ignore changes in case"
|
|
|
|
|
msgstr "Ignorer les différences de casse"
|
|
|
|
|
|
|
|
|
|
#. i18n: file: komparepart/komparesaveoptionsbase.ui:132
|
|
|
|
|
#. i18n: ectx: property (text), widget (QCheckBox, m_ExpandTabsCB)
|
|
|
|
|
#: rc.cpp:42
|
|
|
|
|
msgid "Expand tabs to spaces"
|
|
|
|
|
msgstr "Convertir les tabulations en espaces"
|
|
|
|
|
|
|
|
|
|
#. i18n: file: komparepart/komparesaveoptionsbase.ui:139
|
|
|
|
|
#. i18n: ectx: property (text), widget (QCheckBox, m_IgnoreEmptyLinesCB)
|
|
|
|
|
#: rc.cpp:45
|
|
|
|
|
msgid "Ignore added or removed empty lines"
|
|
|
|
|
msgstr "Ignorer les lignes vides ajoutées ou supprimées"
|
|
|
|
|
|
|
|
|
|
#. i18n: file: komparepart/komparesaveoptionsbase.ui:146
|
|
|
|
|
#. i18n: ectx: property (text), widget (QCheckBox, m_IgnoreWhiteSpaceCB)
|
|
|
|
|
#: rc.cpp:48
|
|
|
|
|
msgid "Ignore changes in whitespace"
|
|
|
|
|
msgstr "Ignorer les modifications dans les espaces"
|
|
|
|
|
|
|
|
|
|
#. i18n: file: komparepart/komparesaveoptionsbase.ui:153
|
|
|
|
|
#. i18n: ectx: property (text), widget (QCheckBox, m_FunctionNamesCB)
|
|
|
|
|
#: rc.cpp:51
|
|
|
|
|
msgid "Show function names"
|
|
|
|
|
msgstr "Afficher le nom des fonctions"
|
|
|
|
|
|
|
|
|
|
#. i18n: file: komparepart/komparesaveoptionsbase.ui:163
|
|
|
|
|
#. i18n: ectx: property (text), widget (QCheckBox, m_RecursiveCB)
|
|
|
|
|
#: rc.cpp:54
|
|
|
|
|
msgid "Compare folders recursively"
|
|
|
|
|
msgstr "Comparer les dossiers récursivement"
|
|
|
|
|
|
|
|
|
|
#. i18n: file: komparepart/komparesaveoptionsbase.ui:173
|
|
|
|
|
#. i18n: ectx: property (text), widget (QCheckBox, m_NewFilesCB)
|
|
|
|
|
#: rc.cpp:57
|
|
|
|
|
msgid "Treat new files as empty"
|
|
|
|
|
msgstr "Considérer les nouveaux fichiers comme vides"
|
|
|
|
|
|
|
|
|
|
#. i18n: file: komparepart/komparesaveoptionsbase.ui:189
|
|
|
|
|
#. i18n: ectx: property (title), widget (QGroupBox, m_FormatGB)
|
|
|
|
|
#: rc.cpp:60 libdialogpages/diffpage.cpp:267
|
|
|
|
|
msgid "Format"
|
|
|
|
|
msgstr "Format"
|
|
|
|
|
|
|
|
|
|
#. i18n: file: komparepart/komparesaveoptionsbase.ui:201
|
|
|
|
|
#. i18n: ectx: property (text), widget (QRadioButton, m_ContextRB)
|
|
|
|
|
#: rc.cpp:63 libdialogpages/diffpage.cpp:236 komparepart/kompare_part.cpp:842
|
|
|
|
|
msgid "Context"
|
|
|
|
|
msgstr "Contexte"
|
|
|
|
|
|
|
|
|
|
#. i18n: file: komparepart/komparesaveoptionsbase.ui:208
|
|
|
|
|
#. i18n: ectx: property (text), widget (QRadioButton, m_EdRB)
|
|
|
|
|
#: rc.cpp:66 komparepart/kompare_part.cpp:848
|
|
|
|
|
msgid "Ed"
|
|
|
|
|
msgstr "Ed"
|
|
|
|
|
|
|
|
|
|
#. i18n: file: komparepart/komparesaveoptionsbase.ui:215
|
|
|
|
|
#. i18n: ectx: property (text), widget (QRadioButton, m_NormalRB)
|
|
|
|
|
#: rc.cpp:69 libdialogpages/diffpage.cpp:239 komparepart/kompare_part.cpp:851
|
|
|
|
|
msgid "Normal"
|
|
|
|
|
msgstr "Normal"
|
|
|
|
|
|
|
|
|
|
#. i18n: file: komparepart/komparesaveoptionsbase.ui:222
|
|
|
|
|
#. i18n: ectx: property (text), widget (QRadioButton, m_RCSRB)
|
|
|
|
|
#: rc.cpp:72 komparepart/kompare_part.cpp:845
|
|
|
|
|
msgid "RCS"
|
|
|
|
|
msgstr "RCS"
|
|
|
|
|
|
|
|
|
|
#. i18n: file: komparepart/komparesaveoptionsbase.ui:229
|
|
|
|
|
#. i18n: ectx: property (text), widget (QRadioButton, m_UnifiedRB)
|
|
|
|
|
#: rc.cpp:75 libdialogpages/diffpage.cpp:242 komparepart/kompare_part.cpp:839
|
|
|
|
|
msgid "Unified"
|
|
|
|
|
msgstr "Unifié"
|
|
|
|
|
|
|
|
|
|
#. i18n: file: komparepart/komparesaveoptionsbase.ui:239
|
|
|
|
|
#. i18n: ectx: property (text), widget (QRadioButton, m_SideBySideRB)
|
|
|
|
|
#: rc.cpp:78
|
|
|
|
|
msgid "Side-by-side"
|
|
|
|
|
msgstr "Côte-à-côte"
|
|
|
|
|
|
|
|
|
|
#. i18n: file: komparepart/komparesaveoptionsbase.ui:257
|
|
|
|
|
#. i18n: ectx: property (text), widget (QLabel, m_ContextLinesLabel)
|
|
|
|
|
#: rc.cpp:81 libdialogpages/diffpage.cpp:255
|
|
|
|
|
msgid "Number of context lines:"
|
|
|
|
|
msgstr "Nombre de lignes de contexte :"
|
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: libdialogpages/viewpage.cpp:57
|
|
|
|
|
msgid "Colors"
|
|
|
|
|
msgstr "Couleurs"
|
2015-05-05 18:24:31 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: libdialogpages/viewpage.cpp:63
|
|
|
|
|
msgid "Removed color:"
|
|
|
|
|
msgstr "Couleur pour les suppressions :"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: libdialogpages/viewpage.cpp:70
|
|
|
|
|
msgid "Changed color:"
|
|
|
|
|
msgstr "Couleur pour les modifications :"
|
2015-05-05 18:24:31 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: libdialogpages/viewpage.cpp:77
|
|
|
|
|
msgid "Added color:"
|
|
|
|
|
msgstr "Couleur pour les ajouts :"
|
2015-05-05 18:24:31 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: libdialogpages/viewpage.cpp:84
|
|
|
|
|
msgid "Applied color:"
|
|
|
|
|
msgstr "Couleur pour les corrections :"
|
2015-05-05 18:24:31 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: libdialogpages/viewpage.cpp:94
|
|
|
|
|
msgid "Mouse Wheel"
|
|
|
|
|
msgstr "Molette de la souris"
|
2015-05-05 18:24:31 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: libdialogpages/viewpage.cpp:98
|
|
|
|
|
msgid "Number of lines:"
|
|
|
|
|
msgstr "Nombre de lignes :"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: libdialogpages/viewpage.cpp:110
|
|
|
|
|
msgid "Tabs to Spaces"
|
|
|
|
|
msgstr "Conversion des tabulations en espaces"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: libdialogpages/viewpage.cpp:114
|
|
|
|
|
msgid "Number of spaces to convert a tab character to:"
|
|
|
|
|
msgstr "Nombre d'espaces pour convertir un caractère de tabulation :"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: libdialogpages/viewpage.cpp:124 kompareurldialog.cpp:60
|
|
|
|
|
msgid "Appearance"
|
|
|
|
|
msgstr "Apparence"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: libdialogpages/viewpage.cpp:134
|
|
|
|
|
msgid "Text Font"
|
|
|
|
|
msgstr "Police du texte"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: libdialogpages/viewpage.cpp:138
|
|
|
|
|
msgid "Font:"
|
|
|
|
|
msgstr "Police :"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: libdialogpages/viewpage.cpp:145
|
|
|
|
|
msgid "Size:"
|
|
|
|
|
msgstr "Taille :"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: libdialogpages/viewpage.cpp:155
|
|
|
|
|
msgid "Fonts"
|
|
|
|
|
msgstr "Polices"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2021-03-28 14:32:36 +03:00
|
|
|
|
#: libdialogpages/filespage.cpp:60
|
|
|
|
|
msgid "Encoding"
|
|
|
|
|
msgstr "Encodage"
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:206
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "Diff Program"
|
|
|
|
|
msgstr "Programme pour l'analyse des différences"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:211
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"You can select a different diff program here. On Solaris the standard diff "
|
|
|
|
|
"program does not support all the options that the GNU version does. This way "
|
|
|
|
|
"you can select that version."
|
2014-12-09 18:43:01 +00:00
|
|
|
|
msgstr ""
|
2015-11-05 07:21:34 +02:00
|
|
|
|
"Vous pouvez ici sélectionner un autre programme d'analyse de différences. "
|
|
|
|
|
"Sous Solaris, le programme standard d'analyse de différences ne prend pas en "
|
|
|
|
|
"charge toutes les options comme le fait la version GNU. Ainsi, vous pouvez "
|
|
|
|
|
"choisir cette version."
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:217 kompareurldialog.cpp:52
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompareprefdlg.cpp:51
|
|
|
|
|
msgid "Diff"
|
|
|
|
|
msgstr "Analyse des différences"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:230
|
2014-12-09 18:43:01 +00:00
|
|
|
|
msgid ""
|
2015-11-05 07:21:34 +02:00
|
|
|
|
"Select the format of the output generated by diff. Unified is the one that "
|
|
|
|
|
"is used most frequently because it is very readable. The KDE developers like "
|
|
|
|
|
"this format the best so use it for sending patches."
|
2014-12-09 18:43:01 +00:00
|
|
|
|
msgstr ""
|
2015-11-05 07:21:34 +02:00
|
|
|
|
"Choisissez le format de la sortie générée par le programme d'analyse de "
|
|
|
|
|
"différences. Le format unifié est celui qui est le plus fréquemment utilisé "
|
|
|
|
|
"car il est très lisible. Comme les développeurs KDE préfèrent ce format, il "
|
|
|
|
|
"vaut mieux l'utiliser pour envoyer des correctifs."
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:233
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "Output Format"
|
|
|
|
|
msgstr "Format de la sortie"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:251
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "Lines of Context"
|
|
|
|
|
msgstr "Lignes de contexte"
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:252 libdialogpages/diffpage.cpp:257
|
|
|
|
|
#: libdialogpages/diffpage.cpp:261
|
2014-12-09 18:43:01 +00:00
|
|
|
|
msgid ""
|
2015-11-05 07:21:34 +02:00
|
|
|
|
"The number of context lines is normally 2 or 3. This makes the diff readable "
|
|
|
|
|
"and applicable in most cases. More than 3 lines will only bloat the diff "
|
|
|
|
|
"unnecessarily."
|
2014-12-09 18:43:01 +00:00
|
|
|
|
msgstr ""
|
2015-11-05 07:21:34 +02:00
|
|
|
|
"Le nombre de lignes de contexte est normalement 2 ou 3, ce qui rend les "
|
|
|
|
|
"différences lisibles et applicables dans la plupart des cas. Utiliser plus "
|
|
|
|
|
"de 3 lignes ne fera que grossir inutilement le fichier de différences."
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:281
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "General"
|
|
|
|
|
msgstr "Général"
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:284
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "&Treat new files as empty"
|
|
|
|
|
msgstr "Con&sidérer les nouveaux fichiers comme vides"
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:285
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "This option corresponds to the -N diff option."
|
|
|
|
|
msgstr "Correspond à l'option « -N » de diff."
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:286
|
2015-05-05 18:24:31 +00:00
|
|
|
|
msgid ""
|
2015-11-05 07:21:34 +02:00
|
|
|
|
"With this option enabled diff will treat a file that only exists in one of "
|
|
|
|
|
"the directories as empty in the other directory. This means that the file is "
|
|
|
|
|
"compared with an empty file and because of this will appear as one big "
|
|
|
|
|
"insertion or deletion."
|
2015-05-05 18:24:31 +00:00
|
|
|
|
msgstr ""
|
2015-11-05 07:21:34 +02:00
|
|
|
|
"Lorsque cette option est cochée, Diff considérera un fichier existant "
|
|
|
|
|
"seulement dans un des dossiers comme étant vide dans l'autre dossier. Cela "
|
|
|
|
|
"signifie que le fichier est comparé avec un fichier vide et, pour cette "
|
|
|
|
|
"raison, il apparaîtra comme une seule insertion ou suppression importante."
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:289
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "&Look for smaller changes"
|
|
|
|
|
msgstr "C&hercher des modifications moins importantes"
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:290
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "This corresponds to the -d diff option."
|
|
|
|
|
msgstr "Correspond à l'option « -d » de diff."
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:291
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"With this option enabled diff will try a little harder (at the cost of more "
|
|
|
|
|
"memory) to find fewer changes."
|
2015-05-05 18:24:31 +00:00
|
|
|
|
msgstr ""
|
2015-11-05 07:21:34 +02:00
|
|
|
|
"Lorsque cette option est cochée, Diff fait une tentative un peu plus précise "
|
|
|
|
|
"(au prix d'une consommation de mémoire supérieure) pour trouver des "
|
|
|
|
|
"modifications moindres."
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:293
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "O&ptimize for large files"
|
|
|
|
|
msgstr "Opti&miser pour les gros fichiers"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:294
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "This corresponds to the -H diff option."
|
|
|
|
|
msgstr "Correspond à l'option « -H » de diff."
|
2014-12-09 18:43:01 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:295
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"This option lets diff makes better diffs when using large files. The "
|
|
|
|
|
"definition of large is nowhere to be found though."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Cette option permet à Diff de mieux traiter les différences lors de "
|
|
|
|
|
"l'utilisation de gros fichiers. La définition du mot « gros » est cependant "
|
|
|
|
|
"introuvable où que ce soit."
|
2014-12-09 18:43:01 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:297
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "&Ignore changes in case"
|
|
|
|
|
msgstr "Ignorer les différences de ca&sse"
|
2014-12-09 18:43:01 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:298
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "This corresponds to the -i diff option."
|
|
|
|
|
msgstr "Correspond à l'option « -i » de diff."
|
2014-12-09 18:43:01 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:299
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"With this option to ignore changes in case enabled, diff will not indicate a "
|
|
|
|
|
"difference when something in one file is changed into SoMEthing in the other "
|
|
|
|
|
"file."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Lorsque cette option permettant d'ignorer les modifications de la casse est "
|
|
|
|
|
"cochée, Diff n'indiquera pas de différence lorsque « quelque chose », dans "
|
|
|
|
|
"un fichier, est changé en « QuELque » chose dans l'autre fichier."
|
2014-12-09 18:43:01 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:308
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "Ignore regexp:"
|
|
|
|
|
msgstr "Ignorer l'expression rationnelle :"
|
2014-12-09 18:43:01 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:309
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "This option corresponds to the -I diff option."
|
|
|
|
|
msgstr "Correspond à l'option « -l » de diff."
|
2014-12-09 18:43:01 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:310
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"When this checkbox is enabled, an option to diff is given that will make "
|
|
|
|
|
"diff ignore lines that match the regular expression."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Lorsque cette case est cochée, une option à Diff est indiquée, qui amènera "
|
|
|
|
|
"Diff à ignorer les lignes correspondant à l'expression rationnelle."
|
2014-12-09 18:43:01 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:314
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Add the regular expression here that you want to use\n"
|
|
|
|
|
"to ignore lines that match it."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Ajoutez ici l'expression rationnelle à utiliser pour ignorer\n"
|
|
|
|
|
"les lignes qui lui correspondent."
|
2014-12-09 18:43:01 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:320
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "&Edit..."
|
|
|
|
|
msgstr "Modifi&er..."
|
2014-12-09 18:43:01 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:322
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Clicking this will open a regular expression dialog where\n"
|
|
|
|
|
"you can graphically create regular expressions."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Cliquer sur cette option permet d'ouvrir une boîte de dialogue d'expressions "
|
|
|
|
|
"rationnelles\n"
|
|
|
|
|
"où vous pouvez créer graphiquement des expressions rationnelles."
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:330
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "Whitespace"
|
|
|
|
|
msgstr "Espaces"
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:333
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "E&xpand tabs to spaces in output"
|
|
|
|
|
msgstr "Convertir les ta&bulations en espaces dans la sortie"
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:334
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "This option corresponds to the -t diff option."
|
|
|
|
|
msgstr "Correspond à l'option « -t » de diff."
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:335
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"This option does not always produce the right result. Due to this expansion "
|
|
|
|
|
"Kompare may have problems applying the change to the destination file."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Cette option ne produit pas toujours le bon résultat. En raison de cette "
|
|
|
|
|
"expansion, Kompare peut avoir des problèmes pour appliquer la modification "
|
|
|
|
|
"au fichier de destination."
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:337
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "I&gnore added or removed empty lines"
|
|
|
|
|
msgstr "I&gnorer les lignes vides ajoutées ou supprimées"
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:338
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "This option corresponds to the -B diff option."
|
|
|
|
|
msgstr "Correspond à l'option « -B » de diff."
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:339
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"This can be very useful in situations where code has been reorganized and "
|
|
|
|
|
"empty lines have been added or removed to improve legibility."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Cette option peut s'avérer très utile dans des situations où le code a été "
|
|
|
|
|
"réorganisé et que les lignes vides ont été ajoutées ou supprimées pour "
|
|
|
|
|
"améliorer la lisibilité."
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:341
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "Ig&nore changes in the amount of whitespace"
|
|
|
|
|
msgstr "Ig&norer les modifications du nombre d'espaces"
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:342
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "This option corresponds to the -b diff option."
|
|
|
|
|
msgstr "Correspond à l'option « -b » de diff."
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:343
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"If you are uninterested in differences arising due to, for example, changes "
|
|
|
|
|
"in indentation, then use this option."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Si des différences survenant, par exemple, en raison de modifications "
|
|
|
|
|
"d'indentation, ne vous intéressent pas, alors cochez cette option."
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:345
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "Ign&ore all whitespace"
|
|
|
|
|
msgstr "Igno&rer tout caractère d'espacement"
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:346
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "This option corresponds to the -w diff option."
|
|
|
|
|
msgstr "Correspond à l'option « -w » de diff."
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:347
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"This is useful for seeing the significant changes without being overwhelmed "
|
|
|
|
|
"by all the white space changes."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Cette option est utile pour voir les modifications significatives sans être "
|
|
|
|
|
"submergé par tous les changements d'espaces."
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:349
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "Igno&re changes due to tab expansion"
|
|
|
|
|
msgstr "Ignorer les &changements dûs à l'expansion des tabulations"
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:350
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "This option corresponds to the -E diff option."
|
|
|
|
|
msgstr "Correspond à l'option « -E » de diff."
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:351
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"If there is a change because tabs have been expanded into spaces in the "
|
|
|
|
|
"other file, then this option will make sure that these do not show up. "
|
|
|
|
|
"Kompare currently has some problems applying such changes so be careful when "
|
|
|
|
|
"you use this option."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"S'il y a une modification parce que des tabulations ont été développées en "
|
|
|
|
|
"espaces dans l'autre fichier, alors cette option veillera à ce que celles-ci "
|
|
|
|
|
"n'apparaissent pas. Comme Kompare a actuellement des problèmes pour "
|
|
|
|
|
"appliquer de telles modifications, soyez prudent lorsque vous utilisez cette "
|
|
|
|
|
"option."
|
2014-12-09 18:43:01 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:371
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "File Pattern to Exclude"
|
|
|
|
|
msgstr "Motif de fichiers à exclure"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:372
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"If this is checked you can enter a shell pattern in the text box on the "
|
|
|
|
|
"right or select entries from the list."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Si cette option est cochée, vous pouvez saisir un motif de filtre dans la "
|
|
|
|
|
"zone de texte à droite ou sélectionner des éléments dans la liste."
|
2015-05-05 18:24:31 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:378
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Here you can enter or remove a shell pattern or select one or more entries "
|
|
|
|
|
"from the list."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Vous pouvez ici ajouter ou supprimer un motif de filtre, ou encore "
|
|
|
|
|
"sélectionner un ou plusieurs éléments de la liste."
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:388
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "File with Filenames to Exclude"
|
|
|
|
|
msgstr "Fichier contenant les noms de fichiers à exclure"
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:389
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "If this is checked you can enter a filename in the combo box below."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Si cette option est cochée, vous pouvez saisir un nom de fichier dans la "
|
|
|
|
|
"zone de liste modifiable ci-dessous."
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:393
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Here you can enter the URL of a file with shell patterns to ignore during "
|
|
|
|
|
"the comparison of the folders."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Vous pouvez ici saisir l'URL d'un fichier avec des motifs de filtres à "
|
|
|
|
|
"ignorer lors de la comparaison des dossiers."
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:397
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Any file you select in the dialog that pops up when you click it will be put "
|
|
|
|
|
"in the dialog to the left of this button."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Tout fichier sélectionné dans la boîte de dialogue qui apparaît quand on "
|
|
|
|
|
"clique dessus sera placé dans la boîte de dialogue située à gauche de ce "
|
|
|
|
|
"bouton."
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libdialogpages/diffpage.cpp:405
|
2015-11-05 07:21:34 +02:00
|
|
|
|
msgid "Exclude"
|
|
|
|
|
msgstr "Exclure"
|
|
|
|
|
|
2021-06-27 14:09:08 +03:00
|
|
|
|
#: kompare_shell.cpp:76
|
2021-03-28 14:32:36 +03:00
|
|
|
|
msgid "Could not load our KompareViewPart."
|
|
|
|
|
msgstr "Impossible de charger le composant KompareViewPart."
|
2015-11-05 07:21:34 +02:00
|
|
|
|
|
2021-06-27 14:09:08 +03:00
|
|
|
|
#: kompare_shell.cpp:80
|
2021-03-28 14:32:36 +03:00
|
|
|
|
msgid "Navigation"
|
|
|
|
|
msgstr "Navigation"
|
2015-11-05 07:21:34 +02:00
|
|
|
|
|
2021-06-27 14:09:08 +03:00
|
|
|
|
#: kompare_shell.cpp:97
|
2021-03-28 14:32:36 +03:00
|
|
|
|
msgid "Could not load our KompareNavigationPart."
|
|
|
|
|
msgstr "Impossible de charger le composant KompareNavigationPart."
|
2015-11-05 07:21:34 +02:00
|
|
|
|
|
2021-06-27 14:09:08 +03:00
|
|
|
|
#: kompare_shell.cpp:198
|
2021-03-28 14:32:36 +03:00
|
|
|
|
msgid "&Open Diff..."
|
|
|
|
|
msgstr "&Ouvrir un fichier d'analyse de différences..."
|
2015-11-05 07:21:34 +02:00
|
|
|
|
|
2021-06-27 14:09:08 +03:00
|
|
|
|
#: kompare_shell.cpp:201
|
2021-03-28 14:32:36 +03:00
|
|
|
|
msgid "&Compare Files..."
|
|
|
|
|
msgstr "&Comparer des fichiers..."
|
2015-11-05 07:21:34 +02:00
|
|
|
|
|
2021-06-27 14:09:08 +03:00
|
|
|
|
#: kompare_shell.cpp:204
|
2021-03-28 14:32:36 +03:00
|
|
|
|
msgid "&Blend URL with Diff..."
|
|
|
|
|
msgstr "&Fusionner un URL avec l'analyse des différences..."
|
2015-11-05 07:21:34 +02:00
|
|
|
|
|
2021-06-27 14:09:08 +03:00
|
|
|
|
#: kompare_shell.cpp:210
|
2021-03-28 14:32:36 +03:00
|
|
|
|
msgid "Show T&ext View"
|
|
|
|
|
msgstr "Afficher la vue du t&exte"
|
2015-11-05 07:21:34 +02:00
|
|
|
|
|
2021-06-27 14:09:08 +03:00
|
|
|
|
#: kompare_shell.cpp:223
|
2021-03-28 14:32:36 +03:00
|
|
|
|
msgid " 0 of 0 differences "
|
|
|
|
|
msgstr " 0 sur 0 différence "
|
2015-11-05 07:21:34 +02:00
|
|
|
|
|
2021-06-27 14:09:08 +03:00
|
|
|
|
#: kompare_shell.cpp:224
|
2021-03-28 14:32:36 +03:00
|
|
|
|
msgid " 0 of 0 files "
|
|
|
|
|
msgstr " 0 sur 0 fichier "
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2021-06-27 14:09:08 +03:00
|
|
|
|
#: kompare_shell.cpp:239
|
2014-12-09 18:43:01 +00:00
|
|
|
|
msgid " %2 of %1 file "
|
|
|
|
|
msgid_plural " %2 of %1 files "
|
|
|
|
|
msgstr[0] " %2 sur %1 fichier"
|
|
|
|
|
msgstr[1] " %2 sur %1 fichiers "
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2021-06-27 14:09:08 +03:00
|
|
|
|
#: kompare_shell.cpp:241
|
2014-12-09 18:43:01 +00:00
|
|
|
|
msgid " %1 file "
|
|
|
|
|
msgid_plural " %1 files "
|
|
|
|
|
msgstr[0] " %1 fichier "
|
|
|
|
|
msgstr[1] " %1 fichiers "
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2021-06-27 14:09:08 +03:00
|
|
|
|
#: kompare_shell.cpp:244
|
2014-12-09 18:43:01 +00:00
|
|
|
|
msgid " %2 of %1 difference, %3 applied "
|
|
|
|
|
msgid_plural " %2 of %1 differences, %3 applied "
|
|
|
|
|
msgstr[0] " %2 sur %1 différence, %3 appliqué"
|
|
|
|
|
msgstr[1] " %2 sur %1 différences, %3 appliqué "
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2021-06-27 14:09:08 +03:00
|
|
|
|
#: kompare_shell.cpp:247
|
2014-12-09 18:43:01 +00:00
|
|
|
|
msgid " %1 difference "
|
|
|
|
|
msgid_plural " %1 differences "
|
|
|
|
|
msgstr[0] "%1 différence "
|
|
|
|
|
msgstr[1] "%1 différences "
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2014-12-09 18:43:01 +00:00
|
|
|
|
# unreviewed-context
|
2021-06-27 14:09:08 +03:00
|
|
|
|
#: kompare_shell.cpp:329
|
2014-12-09 18:43:01 +00:00
|
|
|
|
msgid "Blend File/Folder with diff Output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Fusionner le fichier ou le dossier avec la sortie d'analyse des différences"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2014-12-09 18:43:01 +00:00
|
|
|
|
# unreviewed-context
|
2021-06-27 14:09:08 +03:00
|
|
|
|
#: kompare_shell.cpp:330
|
2014-12-09 18:43:01 +00:00
|
|
|
|
msgid "File/Folder"
|
|
|
|
|
msgstr "Fichier/Dossier"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2021-06-27 14:09:08 +03:00
|
|
|
|
#: kompare_shell.cpp:331
|
2014-12-09 18:43:01 +00:00
|
|
|
|
msgid "Diff Output"
|
|
|
|
|
msgstr "Sortie de l'analyse des différences"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2021-06-27 14:09:08 +03:00
|
|
|
|
#: kompare_shell.cpp:333
|
2014-12-09 18:43:01 +00:00
|
|
|
|
msgid "Blend"
|
|
|
|
|
msgstr "Fusionner"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2021-06-27 14:09:08 +03:00
|
|
|
|
#: kompare_shell.cpp:333
|
2014-12-09 18:43:01 +00:00
|
|
|
|
msgid "Blend this file or folder with the diff output"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Fusionnez ce fichier ou ce dossier avec la sortie d'analyse des différences"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2021-06-27 14:09:08 +03:00
|
|
|
|
#: kompare_shell.cpp:333
|
2014-12-09 18:43:01 +00:00
|
|
|
|
msgid ""
|
|
|
|
|
"If you have entered a file or folder name and a file that contains diff "
|
|
|
|
|
"output in the fields in this dialog then this button will be enabled and "
|
|
|
|
|
"pressing it will open kompare's main view where the output of the entered "
|
|
|
|
|
"file or files from the folder are mixed with the diff output so you can then "
|
|
|
|
|
"apply the difference(s) to a file or to the files. "
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Si vous avez saisi un nom de fichier ou de dossier ainsi qu'un fichier "
|
|
|
|
|
"contenant la sortie de l'analyse des différences dans les champs de cette "
|
|
|
|
|
"boîte de dialogue, alors ce bouton est activé. Un clic sur ce dernier ouvre "
|
|
|
|
|
"la fenêtre principale de kompare, où la sortie des fichiers saisis depuis le "
|
|
|
|
|
"dossier est fusionnée avec la sortie de l'analyse des différences. Ainsi "
|
|
|
|
|
"vous pouvez appliquer les différences aux fichiers. "
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2021-06-27 14:09:08 +03:00
|
|
|
|
#: kompare_shell.cpp:358 main.cpp:201
|
2021-03-28 14:32:36 +03:00
|
|
|
|
msgid "Compare Files or Folders"
|
|
|
|
|
msgstr "Comparer des fichiers ou des dossiers"
|
|
|
|
|
|
2021-06-27 14:09:08 +03:00
|
|
|
|
#: kompare_shell.cpp:359 main.cpp:202
|
2021-03-28 14:32:36 +03:00
|
|
|
|
msgid "Source"
|
|
|
|
|
msgstr "Source"
|
|
|
|
|
|
2021-06-27 14:09:08 +03:00
|
|
|
|
#: kompare_shell.cpp:360 main.cpp:203
|
2021-03-28 14:32:36 +03:00
|
|
|
|
msgid "Destination"
|
|
|
|
|
msgstr "Destination"
|
|
|
|
|
|
2021-06-27 14:09:08 +03:00
|
|
|
|
#: kompare_shell.cpp:362 main.cpp:205
|
2021-03-28 14:32:36 +03:00
|
|
|
|
msgid "Compare"
|
|
|
|
|
msgstr "Comparer"
|
|
|
|
|
|
2021-06-27 14:09:08 +03:00
|
|
|
|
#: kompare_shell.cpp:362
|
2015-05-05 18:24:31 +00:00
|
|
|
|
msgid "Compare these files or folders"
|
|
|
|
|
msgstr "Comparer ces fichiers ou ces dossiers"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2021-06-27 14:09:08 +03:00
|
|
|
|
#: kompare_shell.cpp:362 main.cpp:205
|
2021-03-28 14:32:36 +03:00
|
|
|
|
msgid ""
|
|
|
|
|
"If you have entered 2 filenames or 2 folders in the fields in this dialog "
|
|
|
|
|
"then this button will be enabled and pressing it will start a comparison of "
|
|
|
|
|
"the entered files or folders. "
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Si vous avez saisi deux noms de fichiers ou de dossiers dans les champs de "
|
|
|
|
|
"cette boîte de dialogue, ce bouton est alors activé et lorsque vous cliquez "
|
|
|
|
|
"dessus, il lance une comparaison des fichiers ou des dossiers saisis. "
|
|
|
|
|
|
2021-06-27 14:09:08 +03:00
|
|
|
|
#: kompare_shell.cpp:398
|
2015-05-05 18:24:31 +00:00
|
|
|
|
msgid "Text View"
|
|
|
|
|
msgstr "Afficher le texte"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2015-05-05 18:24:31 +00:00
|
|
|
|
#: kompareurldialog.cpp:44
|
|
|
|
|
msgid "Files"
|
|
|
|
|
msgstr "Fichiers"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2015-05-05 18:24:31 +00:00
|
|
|
|
#: kompareurldialog.cpp:46
|
|
|
|
|
msgid "Here you can enter the files you want to compare."
|
|
|
|
|
msgstr "Vous pouvez ici saisir les noms des fichiers à comparer."
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2015-05-05 18:24:31 +00:00
|
|
|
|
#: kompareurldialog.cpp:54
|
|
|
|
|
msgid "Here you can change the options for comparing the files."
|
|
|
|
|
msgstr "Vous pouvez ici modifier les options pour la comparaison des fichiers."
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2015-05-05 18:24:31 +00:00
|
|
|
|
#: kompareurldialog.cpp:62
|
|
|
|
|
msgid "Here you can change the options for the view."
|
|
|
|
|
msgstr "Vous pouvez ici modifier les options d'affichage."
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2015-05-05 18:24:31 +00:00
|
|
|
|
#: kompareurldialog.cpp:105
|
|
|
|
|
msgid ""
|
|
|
|
|
"File used for excluding files cannot be found, please specify another file."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Fichier utilisé pour exclure les fichiers introuvables. Veuillez indiquer un "
|
|
|
|
|
"autre fichier."
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2021-03-28 14:32:36 +03:00
|
|
|
|
#: main.cpp:43
|
|
|
|
|
msgid ""
|
|
|
|
|
"A program to view the differences between files and optionally generate a "
|
|
|
|
|
"diff"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Un programme permettant d'afficher les différences entre des fichiers et "
|
|
|
|
|
"générer éventuellement un fichier d'affichage des différences (.diff)"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2021-03-28 14:32:36 +03:00
|
|
|
|
#: main.cpp:59
|
|
|
|
|
msgid "Kompare"
|
|
|
|
|
msgstr "Kompare"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2021-03-28 14:32:36 +03:00
|
|
|
|
#: main.cpp:61
|
|
|
|
|
msgid ""
|
|
|
|
|
"(c) 2001-2004 John Firebaugh, (c) 2001-2005,2009 Otto Bruggeman, (c) "
|
|
|
|
|
"2004-2005 Jeff Snyder, (c) 2007-2012 Kevin Kofler"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"(c) 2001-2004 John Firebaugh, (c) 2001-2005,2009 Otto Bruggeman, (c) "
|
|
|
|
|
"2004-2005 Jeff Snyder, (c) 2007-2012 Kevin Kofler"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2021-03-28 14:32:36 +03:00
|
|
|
|
#: main.cpp:62 komparepart/kompare_part.cpp:635
|
|
|
|
|
#: komparenavtreepart/komparenavtreepart.cpp:770
|
|
|
|
|
msgid "John Firebaugh"
|
|
|
|
|
msgstr "John Firebaugh"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2021-03-28 14:32:36 +03:00
|
|
|
|
#: main.cpp:62 main.cpp:63 komparepart/kompare_part.cpp:635
|
|
|
|
|
#: komparepart/kompare_part.cpp:636 komparepart/kompare_part.cpp:637
|
|
|
|
|
#: komparenavtreepart/komparenavtreepart.cpp:770
|
|
|
|
|
#: komparenavtreepart/komparenavtreepart.cpp:771
|
|
|
|
|
msgid "Author"
|
|
|
|
|
msgstr "Auteur"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2021-03-28 14:32:36 +03:00
|
|
|
|
#: main.cpp:63 komparepart/kompare_part.cpp:636
|
|
|
|
|
#: komparenavtreepart/komparenavtreepart.cpp:771
|
|
|
|
|
msgid "Otto Bruggeman"
|
|
|
|
|
msgstr "Otto Bruggeman"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2021-03-28 14:32:36 +03:00
|
|
|
|
#: main.cpp:64
|
|
|
|
|
msgid "Jeff Snyder"
|
|
|
|
|
msgstr "Jeff Snyder"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2021-03-28 14:32:36 +03:00
|
|
|
|
#: main.cpp:64
|
|
|
|
|
msgid "Developer"
|
|
|
|
|
msgstr "Développeur"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2021-03-28 14:32:36 +03:00
|
|
|
|
#: main.cpp:65 komparepart/kompare_part.cpp:637
|
|
|
|
|
msgid "Kevin Kofler"
|
|
|
|
|
msgstr "Kevin Kofler"
|
2014-11-25 13:30:33 +00:00
|
|
|
|
|
2021-03-28 14:32:36 +03:00
|
|
|
|
#: main.cpp:65
|
|
|
|
|
msgid "Maintainer"
|
|
|
|
|
msgstr "Mainteneur"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2021-03-28 14:32:36 +03:00
|
|
|
|
#: main.cpp:66
|
|
|
|
|
msgid "Chris Luetchford"
|
|
|
|
|
msgstr "Chris Luetchford"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2021-03-28 14:32:36 +03:00
|
|
|
|
#: main.cpp:66
|
|
|
|
|
msgid "Kompare icon artist"
|
|
|
|
|
msgstr "Concepteur des icônes de Kompare"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2021-03-28 14:32:36 +03:00
|
|
|
|
#: main.cpp:67
|
|
|
|
|
msgid "Malte Starostik"
|
|
|
|
|
msgstr "Malte Starostik"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2021-03-28 14:32:36 +03:00
|
|
|
|
#: main.cpp:67
|
|
|
|
|
msgid "A lot of good advice"
|
|
|
|
|
msgstr "Beaucoup de suggestions utiles"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2021-03-28 14:32:36 +03:00
|
|
|
|
#: main.cpp:68
|
|
|
|
|
msgid "Bernd Gehrmann"
|
|
|
|
|
msgstr "Bernd Gehrmann"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2021-03-28 14:32:36 +03:00
|
|
|
|
#: main.cpp:68
|
|
|
|
|
msgid "Cervisia diff viewer"
|
|
|
|
|
msgstr "Afficheur de différences pour Cervisia"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2021-03-28 14:32:36 +03:00
|
|
|
|
#: main.cpp:73
|
|
|
|
|
msgid "This will compare URL1 with URL2"
|
|
|
|
|
msgstr "Cette option compare l'URL1 avec l'URL2"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2021-03-28 14:32:36 +03:00
|
|
|
|
#: main.cpp:74
|
|
|
|
|
msgid ""
|
|
|
|
|
"This will open URL1 and expect it to be diff output. URL1 can also be a '-' "
|
|
|
|
|
"and then it will read from standard input. Can be used for instance for cvs "
|
|
|
|
|
"diff | kompare -o -. Kompare will do a check to see if it can find the "
|
|
|
|
|
"original file(s) and then blend the original file(s) into the diffoutput and "
|
|
|
|
|
"show that in the viewer. -n disables the check."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Cette option permet d'ouvrir l'URL1 et s'attend à ce que soit la sortie "
|
|
|
|
|
"d'analyse des différences. L'URL1 peut également être un caractère « - », et "
|
|
|
|
|
"alors il pourra lire depuis l'entrée standard. On peut utiliser cette option "
|
|
|
|
|
"par exemple pour cvs diff | kompare -o -. Kompare vérifiera s'il peut "
|
|
|
|
|
"trouver le ou les fichiers originaux puis les fusionne dans la sortie "
|
|
|
|
|
"d'analyse des différences. Le résultat est ensuite présenté dans "
|
|
|
|
|
"l'afficheur. L'option « -n » désactive la vérification."
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2021-03-28 14:32:36 +03:00
|
|
|
|
#: main.cpp:75
|
|
|
|
|
msgid ""
|
|
|
|
|
"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 "
|
|
|
|
|
"the file or folder that the diffoutput needs to be blended into. "
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Cette option permet de fusionner l'URL2 dans l'URL1. L'URL2 est censé être "
|
|
|
|
|
"la sortie d'analyse des différences, et l'URL1 le fichier ou le dossier dans "
|
|
|
|
|
"lequel la sortie d'analyse des différences doit être fusionnée. "
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2021-03-28 14:32:36 +03:00
|
|
|
|
#: main.cpp:76
|
|
|
|
|
msgid ""
|
|
|
|
|
"Disables the check for automatically finding the original file(s) when using "
|
|
|
|
|
"'-' as URL with the -o option."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Désactive la vérification consistant à trouver automatiquement le ou les "
|
|
|
|
|
"fichiers originaux lorsqu'on utilise « - » comme URL avec l'option « -o »."
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2021-03-28 14:32:36 +03:00
|
|
|
|
#: main.cpp:77
|
|
|
|
|
msgid ""
|
|
|
|
|
"Use this to specify the encoding when calling it from the command line. It "
|
|
|
|
|
"will default to the local encoding if not specified."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Cochez cette option pour spécifier l'encodage lorsque vous l'appelez depuis "
|
|
|
|
|
"la ligne de commande. Elle sera associée par défaut à l'encodage local s'il "
|
|
|
|
|
"n'est pas indiqué."
|
|
|
|
|
|
|
|
|
|
#: main.cpp:205
|
|
|
|
|
msgid "Compare these files or folder"
|
|
|
|
|
msgstr "Comparer ces fichiers ou dossiers"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:175
|
|
|
|
|
msgid "Save &All"
|
|
|
|
|
msgstr "Tout enre&gistrer"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:177
|
|
|
|
|
msgid "Save &Diff..."
|
|
|
|
|
msgstr "Enregistrer dans un fichier &Diff..."
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:179
|
|
|
|
|
msgid "Swap Source with Destination"
|
|
|
|
|
msgstr "Échanger la source et la destination"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:181
|
|
|
|
|
msgid "Show Statistics"
|
|
|
|
|
msgstr "Afficher les statistiques"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:184
|
|
|
|
|
msgid "Refresh Diff"
|
|
|
|
|
msgstr "Rafraîchir l'affichage des différences"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:292 komparepart/kompare_part.cpp:303
|
|
|
|
|
msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
|
|
|
|
|
msgstr "<qt>Impossible de télécharger l'URL <b>%1</b>.</qt>"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:341
|
|
|
|
|
msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
|
|
|
|
|
msgstr "<qt>Le fichier <b>%1</b> n'existe pas sur votre système.</qt>"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:533
|
|
|
|
|
msgid "Diff Options"
|
|
|
|
|
msgstr "Options d'affichage des différences"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:551
|
|
|
|
|
msgid "*.diff *.dif *.patch|Patch Files"
|
|
|
|
|
msgstr "*.diff *.dif *.patch|Fichiers correctifs"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:551
|
|
|
|
|
msgid "Save .diff"
|
|
|
|
|
msgstr "Enregistrer le fichier .diff"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:554
|
|
|
|
|
msgid "The file exists or is write-protected; do you want to overwrite it?"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
msgstr ""
|
2015-11-05 07:21:34 +02:00
|
|
|
|
"Le fichier existe déjà ou est protégé en écriture. Voulez-vous l'écraser ?"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:554
|
|
|
|
|
msgid "File Exists"
|
|
|
|
|
msgstr "Le fichier existe déjà"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:554
|
|
|
|
|
msgid "Overwrite"
|
|
|
|
|
msgstr "Écraser"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:554
|
|
|
|
|
msgid "Do Not Overwrite"
|
|
|
|
|
msgstr "Ne pas écraser"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:634
|
|
|
|
|
msgid "KomparePart"
|
|
|
|
|
msgstr "KomparePart"
|
|
|
|
|
|
|
|
|
|
#: komparepart/kompare_part.cpp:647
|
|
|
|
|
msgid "Running diff..."
|
|
|
|
|
msgstr "Recherche des différences en cours..."
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:650
|
|
|
|
|
msgid "Parsing diff output..."
|
|
|
|
|
msgstr "Analyse de la sortie d'analyse des différences..."
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:699
|
|
|
|
|
msgid "Comparing file %1 with file %2"
|
|
|
|
|
msgstr "Comparaison du fichier %1 avec le fichier %2"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:704
|
|
|
|
|
msgid "Comparing files in %1 with files in %2"
|
|
|
|
|
msgstr "Comparaison des fichiers dans %1 avec ceux dans %2"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:709
|
|
|
|
|
msgid "Viewing diff output from %1"
|
|
|
|
|
msgstr "Affichage de la sortie d'analyse des différences depuis %1"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:712
|
|
|
|
|
msgid "Blending diff output from %1 into file %2"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
msgstr ""
|
2015-11-05 07:21:34 +02:00
|
|
|
|
"Fusionner la sortie d'analyse des différences depuis %1 dans le fichier %2"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:717
|
|
|
|
|
msgid "Blending diff output from %1 into folder %2"
|
|
|
|
|
msgstr "Fusionner la sortie d'analyse des différences de %1 dans le dossier %2"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:768 komparepart/kompare_part.cpp:799
|
|
|
|
|
#: komparepart/kompare_part.cpp:914
|
2015-02-28 22:17:11 +00:00
|
|
|
|
msgid ""
|
2015-11-05 07:21:34 +02:00
|
|
|
|
"You have made changes to the destination file(s).\n"
|
|
|
|
|
"Would you like to save them?"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
msgstr ""
|
2015-11-05 07:21:34 +02:00
|
|
|
|
"Vous avez effectué des modifications dans le(s) fichier(s) de destination.\n"
|
|
|
|
|
"Voulez-vous enregistrer ces modifications ?"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:770 komparepart/kompare_part.cpp:801
|
|
|
|
|
#: komparepart/kompare_part.cpp:916
|
|
|
|
|
msgid "Save Changes?"
|
|
|
|
|
msgstr "Enregistrer les modifications ?"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:855
|
|
|
|
|
#: komparenavtreepart/komparenavtreepart.cpp:629
|
|
|
|
|
msgid "Unknown"
|
|
|
|
|
msgstr "Inconnu"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:871
|
|
|
|
|
msgid ""
|
|
|
|
|
"No diff file, or no 2 files have been diffed. Therefore no stats are "
|
|
|
|
|
"available."
|
2015-02-28 22:17:11 +00:00
|
|
|
|
msgstr ""
|
2015-11-05 07:21:34 +02:00
|
|
|
|
"Il n'y a aucun fichier d'analyse de différences, ou bien aucune analyse de "
|
|
|
|
|
"différences n'a été effectuée sur 2 fichiers. Par conséquent aucune "
|
|
|
|
|
"statistique n'est disponible."
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:873 komparepart/kompare_part.cpp:887
|
|
|
|
|
#: komparepart/kompare_part.cpp:903
|
|
|
|
|
msgid "Diff Statistics"
|
|
|
|
|
msgstr "Statistiques de comparaison"
|
|
|
|
|
|
|
|
|
|
#: komparepart/kompare_part.cpp:877
|
2015-02-28 22:17:11 +00:00
|
|
|
|
msgid ""
|
2015-11-05 07:21:34 +02:00
|
|
|
|
"Statistics:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Old file: %1\n"
|
|
|
|
|
"New file: %2\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Format: %3\n"
|
|
|
|
|
"Number of hunks: %4\n"
|
|
|
|
|
"Number of differences: %5"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
msgstr ""
|
2015-11-05 07:21:34 +02:00
|
|
|
|
"Statistiques :\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Ancien fichier : %1\n"
|
|
|
|
|
"Nouveau fichier : %2\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Format : %3\n"
|
|
|
|
|
"Nombre de blocs de différences : %4\n"
|
|
|
|
|
"Nombre de différences : %5"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2015-11-05 07:21:34 +02:00
|
|
|
|
#: komparepart/kompare_part.cpp:890
|
2015-02-28 22:17:11 +00:00
|
|
|
|
msgid ""
|
2015-11-05 07:21:34 +02:00
|
|
|
|
"Statistics:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Number of files in diff file: %1\n"
|
|
|
|
|
"Format: %2\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Current old file: %3\n"
|
|
|
|
|
"Current new file: %4\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Number of hunks: %5\n"
|
|
|
|
|
"Number of differences: %6"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
msgstr ""
|
2015-11-05 07:21:34 +02:00
|
|
|
|
"Statistiques :\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Nombre de fichiers dans le fichier de différences : %1\n"
|
|
|
|
|
"Format : %2\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Ancien fichier actuel : %3\n"
|
|
|
|
|
"Nouveau fichier actuel : %4\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Nombre de blocs de différences : %5\n"
|
|
|
|
|
"Nombre de différences : %6"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2021-03-28 14:32:36 +03:00
|
|
|
|
#: komparepart/kompareprefdlg.cpp:35
|
|
|
|
|
msgid "Preferences"
|
|
|
|
|
msgstr "Préférences"
|
|
|
|
|
|
|
|
|
|
#: komparepart/kompareprefdlg.cpp:45
|
|
|
|
|
msgid "View"
|
|
|
|
|
msgstr "Affichage"
|
|
|
|
|
|
|
|
|
|
#: komparepart/kompareprefdlg.cpp:47
|
|
|
|
|
msgid "View Settings"
|
|
|
|
|
msgstr "Options d'affichage"
|
|
|
|
|
|
|
|
|
|
#: komparepart/kompareprefdlg.cpp:53
|
|
|
|
|
msgid "Diff Settings"
|
|
|
|
|
msgstr "Paramètres d'affichage des différences"
|
|
|
|
|
|
|
|
|
|
#: komparenavtreepart/komparenavtreepart.cpp:63
|
|
|
|
|
msgid "Source Folder"
|
|
|
|
|
msgstr "Dossier source"
|
|
|
|
|
|
|
|
|
|
#: komparenavtreepart/komparenavtreepart.cpp:69
|
|
|
|
|
msgid "Destination Folder"
|
|
|
|
|
msgstr "Dossier de destination"
|
|
|
|
|
|
|
|
|
|
#: komparenavtreepart/komparenavtreepart.cpp:75
|
|
|
|
|
msgid "Source File"
|
|
|
|
|
msgstr "Fichier source"
|
|
|
|
|
|
|
|
|
|
#: komparenavtreepart/komparenavtreepart.cpp:75
|
|
|
|
|
msgid "Destination File"
|
|
|
|
|
msgstr "Fichier de destination"
|
|
|
|
|
|
|
|
|
|
#: komparenavtreepart/komparenavtreepart.cpp:82
|
|
|
|
|
msgid "Source Line"
|
|
|
|
|
msgstr "Ligne source"
|
|
|
|
|
|
|
|
|
|
#: komparenavtreepart/komparenavtreepart.cpp:82
|
|
|
|
|
msgid "Destination Line"
|
|
|
|
|
msgstr "Ligne de destination"
|
|
|
|
|
|
|
|
|
|
#: komparenavtreepart/komparenavtreepart.cpp:82
|
|
|
|
|
msgid "Difference"
|
|
|
|
|
msgstr "Différences"
|
|
|
|
|
|
|
|
|
|
#: komparenavtreepart/komparenavtreepart.cpp:456
|
|
|
|
|
msgid "Applied: Changes made to %1 line undone"
|
|
|
|
|
msgid_plural "Applied: Changes made to %1 lines undone"
|
|
|
|
|
msgstr[0] "Appliqué : les modifications effectuées sur %1 ligne sont annulées"
|
|
|
|
|
msgstr[1] "Appliqué : les modifications effectuées sur %1 lignes sont annulées"
|
|
|
|
|
|
|
|
|
|
#: komparenavtreepart/komparenavtreepart.cpp:459
|
|
|
|
|
msgid "Changed %1 line"
|
|
|
|
|
msgid_plural "Changed %1 lines"
|
|
|
|
|
msgstr[0] "Modifié %1 ligne"
|
|
|
|
|
msgstr[1] "Modifié %1 lignes"
|
|
|
|
|
|
|
|
|
|
#: komparenavtreepart/komparenavtreepart.cpp:464
|
|
|
|
|
msgid "Applied: Insertion of %1 line undone"
|
|
|
|
|
msgid_plural "Applied: Insertion of %1 lines undone"
|
|
|
|
|
msgstr[0] "Appliqué : l'insertion d''%1 ligne a été annulée"
|
|
|
|
|
msgstr[1] "Appliqué : l'insertion de %1 lignes a été annulée"
|
|
|
|
|
|
|
|
|
|
#: komparenavtreepart/komparenavtreepart.cpp:467
|
|
|
|
|
msgid "Inserted %1 line"
|
|
|
|
|
msgid_plural "Inserted %1 lines"
|
|
|
|
|
msgstr[0] "Inséré %1 ligne"
|
|
|
|
|
msgstr[1] "Inséré %1 lignes"
|
|
|
|
|
|
|
|
|
|
#: komparenavtreepart/komparenavtreepart.cpp:472
|
|
|
|
|
msgid "Applied: Deletion of %1 line undone"
|
|
|
|
|
msgid_plural "Applied: Deletion of %1 lines undone"
|
|
|
|
|
msgstr[0] "Appliqué : la suppression d'%1 ligne a été annulée"
|
|
|
|
|
msgstr[1] "Appliqué : la suppression de %1 lignes a été annulée"
|
|
|
|
|
|
|
|
|
|
#: komparenavtreepart/komparenavtreepart.cpp:475
|
|
|
|
|
msgid "Deleted %1 line"
|
|
|
|
|
msgid_plural "Deleted %1 lines"
|
|
|
|
|
msgstr[0] "Supprimé %1 ligne"
|
|
|
|
|
msgstr[1] "Supprimé %1 lignes"
|
|
|
|
|
|
|
|
|
|
#: komparenavtreepart/komparenavtreepart.cpp:769
|
|
|
|
|
msgid "KompareNavTreePart"
|
|
|
|
|
msgstr "KompareNavTreePart"
|
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libkomparediff2/komparemodellist.cpp:70
|
2015-05-05 18:24:31 +00:00
|
|
|
|
msgid "&Apply Difference"
|
|
|
|
|
msgstr "Appli&quer les différences"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libkomparediff2/komparemodellist.cpp:74
|
2015-05-05 18:24:31 +00:00
|
|
|
|
msgid "Un&apply Difference"
|
|
|
|
|
msgstr "Annuler l'application des différence&s"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libkomparediff2/komparemodellist.cpp:78
|
2015-05-05 18:24:31 +00:00
|
|
|
|
msgid "App&ly All"
|
|
|
|
|
msgstr "Tout app&liquer"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libkomparediff2/komparemodellist.cpp:82
|
2015-05-05 18:24:31 +00:00
|
|
|
|
msgid "&Unapply All"
|
|
|
|
|
msgstr "Annuler &toutes les modifications"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libkomparediff2/komparemodellist.cpp:86
|
2015-05-05 18:24:31 +00:00
|
|
|
|
msgid "P&revious File"
|
|
|
|
|
msgstr "Fichier &précédent"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libkomparediff2/komparemodellist.cpp:90
|
2015-05-05 18:24:31 +00:00
|
|
|
|
msgid "N&ext File"
|
|
|
|
|
msgstr "Fichier &suivant"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libkomparediff2/komparemodellist.cpp:94
|
2015-05-05 18:24:31 +00:00
|
|
|
|
msgid "&Previous Difference"
|
|
|
|
|
msgstr "Différence p&récédente"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libkomparediff2/komparemodellist.cpp:98
|
2015-05-05 18:24:31 +00:00
|
|
|
|
msgid "&Next Difference"
|
|
|
|
|
msgstr "Différence s&uivante"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libkomparediff2/komparemodellist.cpp:257
|
|
|
|
|
#: libkomparediff2/komparemodellist.cpp:282
|
2015-05-05 18:24:31 +00:00
|
|
|
|
msgid ""
|
|
|
|
|
"<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff "
|
|
|
|
|
"file.</qt>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"<qt>Aucun modèle ou aucune différence, ce fichier : <b>%1</b> n'est pas un "
|
|
|
|
|
"fichier d'analyse de différences valable.</qt>"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libkomparediff2/komparemodellist.cpp:266
|
2015-05-05 18:24:31 +00:00
|
|
|
|
msgid ""
|
|
|
|
|
"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
|
|
|
|
|
"qt>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"<qt>Des problèmes sont apparus lors de l'application du fichier d'analyse de "
|
|
|
|
|
"différences <b>%2</b> au fichier <b>%1</b>.</qt>"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libkomparediff2/komparemodellist.cpp:293
|
2015-05-05 18:24:31 +00:00
|
|
|
|
msgid ""
|
|
|
|
|
"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>."
|
|
|
|
|
"</qt>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"<qt>Des problèmes sont apparus lors de l'application du fichier d'analyse de "
|
|
|
|
|
"différences <b>%1</b> au dossier <b>%2</b>.</qt>"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libkomparediff2/komparemodellist.cpp:325
|
|
|
|
|
#: libkomparediff2/komparemodellist.cpp:656
|
2015-05-05 18:24:31 +00:00
|
|
|
|
msgid "Could not open a temporary file."
|
|
|
|
|
msgstr "Impossible d'ouvrir un fichier temporaire."
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libkomparediff2/komparemodellist.cpp:373
|
|
|
|
|
#: libkomparediff2/komparemodellist.cpp:380
|
2015-05-05 18:24:31 +00:00
|
|
|
|
msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"<qt>Impossible d'écrire dans le fichier temporaire <b>%1</b>, on le supprime."
|
|
|
|
|
"</qt>"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libkomparediff2/komparemodellist.cpp:408
|
2015-05-05 18:24:31 +00:00
|
|
|
|
msgid ""
|
|
|
|
|
"<qt>Could not create destination directory <b>%1</b>.\n"
|
|
|
|
|
"The file has not been saved.</qt>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"<qt>Impossible de créer le dossier de destination <b>%1</b>.\n"
|
|
|
|
|
"Le fichier n'a pas été Impossible d'enregistrer le fichier.</qt>"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libkomparediff2/komparemodellist.cpp:425
|
2015-05-05 18:24:31 +00:00
|
|
|
|
msgid ""
|
|
|
|
|
"<qt>Could not upload the temporary file to the destination location <b>%1</"
|
|
|
|
|
"b>. The temporary file is still available under: <b>%2</b>. You can manually "
|
|
|
|
|
"copy it to the right place.</qt>"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"<qt>Impossible d'envoyer le fichier temporaire dans l'emplacement de "
|
|
|
|
|
"destination <b>%1</b>. Le fichier temporaire est encore disponible sous : <b>"
|
|
|
|
|
"%2</b>. Vous pouvez le copier manuellement dans l'emplacement approprié.</qt>"
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libkomparediff2/komparemodellist.cpp:490
|
|
|
|
|
#: libkomparediff2/komparemodellist.cpp:603
|
|
|
|
|
#: libkomparediff2/komparemodellist.cpp:623
|
2015-05-05 18:24:31 +00:00
|
|
|
|
msgid "Could not parse diff output."
|
|
|
|
|
msgstr "Impossible d'analyser la syntaxe de la sortie des différences."
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libkomparediff2/komparemodellist.cpp:506
|
2015-05-05 18:24:31 +00:00
|
|
|
|
msgid "The files are identical."
|
|
|
|
|
msgstr "Les fichiers sont identiques."
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libkomparediff2/komparemodellist.cpp:688
|
2015-05-05 18:24:31 +00:00
|
|
|
|
msgid "Could not write to the temporary file."
|
|
|
|
|
msgstr "Impossible d'écrire dans le fichier temporaire."
|
2015-02-28 22:17:11 +00:00
|
|
|
|
|
2016-05-16 03:46:56 +00:00
|
|
|
|
#: libkomparediff2/komparemodellist.cpp:961
|
2015-05-05 18:24:31 +00:00
|
|
|
|
msgid ""
|
|
|
|
|
"The diff is malformed. Some lines could not be parsed and will not be "
|
|
|
|
|
"displayed in the diff view."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Le fichier de différences est mal formé. Il est impossible d'analyser "
|
|
|
|
|
"certaines lignes qui ne seront donc pas afficher dans la vue des différences."
|