winmerge-support — Ask all your support questions on this list

[Winmerge-support] open winMerge from browser

[Tim V. D. H. <ti...@gm...>]

Hi there,

Trying to open winMerge from firefox

I tried this.

<project>
   <paths>
      <left>e:\ResultsWeb23.cfc</left>
      <right>e:ResultsWeb-18.cfc</right>
   </paths>
</project>

with a content header type of "application/winMerge"

Hah, not sure what I should be doing really. Winmerge loads my xml
onto left side, not process it as xml file :(

Kindly,

TiM

Re: [Winmerge-support] Slow Performance

[Dee E. <de...@ea...>]

On 24/12/2009 19:16, jg...@ma... wrote:
>   Hi
> I am a big fan of win merge. It has been very helpful to me helping a
> blind man with his music files. He has a Dell XPS 400 and your app
> worked super fast when he had the Windows XP OS. He recently changed to
> Windows 7 and I reinstalled winmerge. Now it runs incredibly slow. It
> takes over an hour to do what it did before in a few minutes.
>
> Could you please advise me on a course of action to fix this? Please
> reply all so that the blind man gets the msg.

Seeing as you're using it for music files, I assume you aren't doing 
text content comparison which is the slow part.
I expect you just need to change the "File compare method" in the 
Compare settings to "Modified Date and size" rather than "Full contents"
Setting "Stop after first difference" may also help.

Hope this is useful.

-- 
Dee Earley (de...@ea...)

irc:    irc://irc.blitzed.org/
web:    http://www.earlsoft.co.uk
phone:  +44 (0)780 8369596

[Winmerge-support] Slow Performance

[<jg...@ma...>]

 Hi
I am a big fan of win merge.  It has been very helpful to me helping a blind man with his music files.  He has a Dell XPS 400 and your app worked super fast when he had the Windows XP OS. He recently changed to Windows 7 and I reinstalled winmerge.  Now it runs incredibly slow.  It takes over an hour to do what it did before in a few minutes.

Could you please advise me on a course of action to fix this?  Please reply all so that the blind man gets the msg.  

Thanks so much. 

 

Jeffrey Graber
"Experience is not what happens to you; it's what you do with what happens to you." (Aldous Huxley)

[Winmerge-support] write regular expression to remove a line from difference.

[Priyank B. <pri...@gm...>]

I want to write regular expression to remove a line from difference. 
Like see the two lines:

|this.Visible  =  true;
Visible  =  true;
|

And can I write an expression such that if line difference is exactly 
|"this."| ignore the difference.

I give you one more example like |System.Exception| and |Exception| both 
are same for me, so I want to ignore the "|System." difference
Is this possible in Winmerge.
|

Re: [Winmerge-support] win 7?

[Dee E. <de...@ea...>]

On Wed, December 9, 2009 20:41, Debbie Pomerance wrote:
> Hi, I use winmerge, and I am wondering at what point may
> you be releasing a version that supports win7 professional?

If you're going to make wild cliams, at least try clarifying them.
WinMerge works fine here on Windows 7.

-- 
Dee Earley (de...@ea...)

[Winmerge-support] win 7?

[Debbie P. <deb...@gm...>]

Hi, I use winmerge, and I am wondering at what point may
 you be releasing a version that supports win7 professional?

Thank you.

Debbie P.

-- 

Debbie Pomerance
mailto Deb...@gm...

Microsoft: "You've got questions. We've got dancing paperclips."
For Net security use Unix, Linux, any 'ix' OS.

[Winmerge-support] I can not disconnect the external USB drives

[Utente <Ale...@ho...>]

Hi
I use Windows 7 64 bit. Having worked with Winmwerge (latest version 2.12.4), Then I can not disconnect the external USB.
Always appears the error: 'Can not stop the device' Generic volume 'because in use in another program'.
I have to restart the pc, because in Task Manager can not identify the process that locks the drives.
I realized that the problem was due to WinMerge for exclusion.
When not in use WinMerge during the working session, the problem does not occur.
Sincerely

Re: [Winmerge-support] Winmerge not working right on files, but ok on folders

[Dee E. <de...@ea...>]

On 27/10/2009 20:46, Bonneville, Douglas wrote:
> Out of the blue, after years of using WinMerge inside of Dreamweaver, it
> decided to act up. It takes nearly 30 seconds to compare any two files,
> either from within Dreamweaver, or if I compare directly from a file
> folder in Explorer. If I compare folders, it comes up in a snap, as
> usual. I'm using the latest release from a clean install, and it still
> does it. I was using 2.8 when it started happening.
>
> I have not installed or uninstalled anything manually in a very long
> time, so nothing changed as a result of my actions.
>
> However, over the weekend, our network issued SVP 3 for XP Pro. I got
> that installed automatically. That is the only thing different.
>
> Any clues as to how to get this fixed? It's essentially impossible to
> use now, with a 30 second wait to just see 2 text files that used to
> take about 1-2 seconds.

Does the file compare from a folder compare still take ages?
How about opening two files from inside WinMerge itself?

Sorry to say that I'm using SP3 on all my XP machines without issue.

-- 
Dee Earley (de...@ea...)

irc:    irc://irc.blitzed.org/
web:    http://www.earlsoft.co.uk
phone:  +44 (0)780 8369596

[Winmerge-support] Winmerge not working right on files, but ok on folders

[Bonneville, D. <Dou...@py...>]

Out of the blue, after years of using WinMerge inside of Dreamweaver, it
decided to act up. It takes nearly 30 seconds to compare any two files,
either from within Dreamweaver, or if I compare directly from a file
folder in Explorer. If I compare folders, it comes up in a snap, as
usual. I'm using the latest release from a clean install, and it still
does it. I was using 2.8 when it started happening.

I have not installed or uninstalled anything manually in a very long
time, so nothing changed as a result of my actions.

However, over the weekend, our network issued SVP 3 for XP Pro. I got
that installed automatically. That is the only thing different. 

Any clues as to how to get this fixed? It's essentially impossible to
use now, with a 30 second wait to just see 2 text files that used to
take about 1-2 seconds.

Thanks,

Doug

[Winmerge-support] New feature request for display/report of comparing files

[Stephan M. <sma...@ya...>]

Hello,


it will be helpfull if we could display/report ONLY the differences between two files.

I don't find any plugin about.

If somebody has some workaround, I will appreciate.

Thanks in advance,

Stephan



      

Re: [Winmerge-support] New feature request for display/report of comparing files

[Dee E. <de...@ea...>]

On 23/09/2009 15:20, Stephan Mardaga wrote:
> Hello,
> it will be helpfull if we could display/report ONLY the differences
> between two files.
> I don't find any plugin about.
> If somebody has some workaround, I will appreciate.
> Thanks in advance,
> Stephan

How do you mean?
Similar to unified output from diff?

WinMerge can create a patch file, but it is extremely easy to browse 
through changes in a file anyway.

-- 
Dee Earley (de...@ea...)

irc:    irc://irc.blitzed.org/
web:    http://www.earlsoft.co.uk
phone:  +44 (0)780 8369596

[Winmerge-support] New feature request for display/report of comparing files

[Stephan M. <sma...@ya...>]

Hello,

it will be helpfull if we could display/report ONLY the differences between two files.

I don't find any plugin about.

If somebody has some workaround, I will appreciate.

Thanks in advance,

Stephan


      

[Winmerge-support] WinMerge GUI is freezing

[<Tho...@t-...>]

Hello,

I'm using the version 2.12.4 of WinMerge. 

But the GUI always freezes when I try to compare two files, even when I
choose very small text files created by notepad. Additionally the CPU
usage is very high at nearly 50% and the GUI never ends. I always have
to stop the WinMerge process by using the taskmanager.

I tried to install older versions, but getting the same effect.

On my old computer I used this very useful tool since a long time
without any problem.

I hope to get information about that problem und looking forward to hear
from you.


Hint: Below you could find the configuration file of WinMerge.


Regards,
Thomas Schneider



WinMerge configuration log
--------------------------
Saved to: D:\Eigene Dateien\WinMerge\WinMerge.txt
* Please add this information (or attach this file)
* when reporting bugs.
Module names prefixed with tilda (~) are currently loaded in WinMerge
process.


Version information:
 WinMerge.exe: 2.12.4.0
 Build config:  UNICODE  _UNICODE 
 Command Line:  none
 Windows: Microsoft Windows XP Professional Service Pack 2 (Build 2600)
~COMCTL32.dll         dllversion=6.00 dllbuild=2900
~shlwapi.dll          dllversion=6.00 dllbuild=2900
~MergeLang.dll        version=2.12 build=0004
 ShellExtension.dll   version=0.00 build=0000
 ShellExtensionU.dll  version=1.15 build=0002
 ShellExtensionX64.dll version=0.00 build=0000

WinMerge configuration:
 Compare settings:
  Ignore blank lines: No
  Ignore case: No
  Ignore carriage return differences: No
  Whitespace compare: Compare all
  Detect moved blocks: No
  Compare method: 0
  Stop after first diff: No

 Other settings:
  Automatic rescan: No
  Simple EOL: Yes
  Automatic scroll to 1st difference: No
  Backup original file: No

 Folder compare:
  Identical files: Yes
  Different files: Yes
  Left Unique files: Yes
  Right Unique files: Yes
  Binary files: Yes
  Skipped files: No
  Tree-mode enabled: No

 File compare:
  Preserve filetimes: No
  Match similar lines: No

 Editor settings:
  View Whitespace: No
  Merge Mode enabled: No
  Show linenumbers: No
  Wrap lines: No
  Syntax Highlight: Yes
  Tab size: 4
  Insert tabs: Yes

 Font:
  Font facename: Courier New
  Font charset: 0 (Ansi)

System settings:
 codepage settings:
  ANSI codepage: 1252
  OEM codepage: 437
 Locale (Thread):
  Def ANSI codepage: 1252
  Def OEM codepage: 850
  Country: Germany
  Language: German
  Language code: 0407
  ISO Language code: de
 Locale (User):
  Def ANSI codepage: 1252
  Def OEM codepage: 850
  Country: Germany
  Language: German
  Language code: 0407
  ISO Language code: de
 Locale (System):
  Def ANSI codepage: 1252
  Def OEM codepage: 437
  Country: United States
  Language: English
  Language code: 0409
  ISO Language code: en
 Detect codepage automatically for RC and HTML files: No
 unicoder codepage: 1252

Plugins:
 Plugins enabled: No
 Unpackers: 
 Prediffers: 
 Editor scripts: 

Archive support:
 Enable: 1
 7-Zip software installed on your computer: 0.00
  Codecs:
  Formats:
 7-Zip components for standalone operation: 0.00
  Codecs:
  Formats:
 Merge7z plugins on path:

WinMerge configuration log
--------------------------

[Winmerge-support] Ignoring codepage differencies

[Roland T. <ko...@ro...>]

Hello win...@li...!

Is is possible to turn on ignoring of codepage differences.

I am using two codebases which has the same code, but the comments,
strings, constants, ... are different only in codepage.

Thanks for any response.

-- 
Best regards, TRoland
http://www.rotursoft.sk
http://exekutor.rotursoft.sk

[Winmerge-support] Brazilian portuguese language file updated

[Felipe <fel...@ig...>]

hi, here it's the file updated, i had to remove the .7z extension
because of sourceforge, i couldnt apply the translation to winmerge by
some unexplained reason, poedit didnt give any errors regarding it.

Re: [Winmerge-support] Corrected mistranslated items and improvedFrench language

[Kimmo V. <ki...@wi...>]

Hi and sorry it took so long to respond!

> I have corrected many mistranslated items and also
> improved the language while I was at it

Thanks for your efforts and sharing the work!

> I apologize I have been unable to make a patch but
> it will be easy to compare the difference using
> WinMerge ;) and hope you will be able to use it this
> way.

Both patches (diff/TortoiseSVN) and updated files are
OK for us.

> And I have also corrected just one item in the
> shell extension file("Compare with" in French is
> "Comparer à"and NOT "Comparer avec").

Please don't send executable/dll files by e-mail. I
won't run/use those (and hope nodoby else will) for
obvious reasons. As the change is one string change,
I copy/pasted it to the RC file myself. But sending
patch or whole updated RC files is the correct way.

I added the updates as new patch item to our patch
tracker:
#2828449 French translation update
http://winmerge.org/patch/2828449

Regards,
Kimmo

Re: [Winmerge-support] Linux platform

[Kimmo V. <ki...@wi...>]

Hi,

> Is winmerge supported in Linux platform.

No. WinMerge works only in Windows.

We want to make WinMerge cross-platform but there is still lots of work to do.

Regards,
Kimmo

[Winmerge-support] Vietnamese Translation

[anh p. <pp...@gm...>]

My name is Phan Anh
and i am translating the English interface of winmerge into Vietnamese.
I will send the po file to you in a short time.
Hope for your reply.

Re: [Winmerge-support] Updated Ukrainian translation

[Kimmo V. <ki...@wi...>]

Hi, and sorry for the delay!

> Hello! I updated Ukrainian translation, corrected errors, inaccuracies
> sufferet by me before, changed the names of some functions 2 more clear
> for man who know Ukrainian. All update to v2.12.4

Thanks, I've now committed this update to SVN so next releases will 
contain your fixes.

Regards,
Kimmo

[Winmerge-support] Linux platform

[Sardeshmukh, A. <Amr...@ge...>]

Hi,

Is winmerge supported in Linux platform.

 

Regards

Amruta

[Winmerge-support] Corrected mistranslated items and improved French language

[Eyael <ey...@fr...>]

# This file is part from WinMerge <http://winmerge.org/>
# Released under the "GNU General Public License"
#
# Translators:
# * Gil Andre <gil_andre at compuserve.com>
# * Laurent Ganier <ccganier at club-internet.fr>
# * Jean-F Jolin <jean-f-j at users.sourceforge.net>
# * Dominique Saussereau <redguff at users.sourceforge.net>
# * Eyael (correction) <winmerge sur http://www.gratilog.net/>
#
# ID line follows -- this is updated by SVN
# $Id: French.po 6469 2009-02-17 14:15:31Z kimmov $
#
msgid ""
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2009-02-15 14:33-0500\n"
"Last-Translator: Jean-F Jolin  <jean-f-j at users.sourceforge.net>\n"
"Language-Team: French <win...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CP1252\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: French\n"
"X-Poedit-SourceCharset: CP1252\n"
"X-Poedit-Basepath: ../\n"

#. LANGUAGE, SUBLANGUAGE
#: Merge.rc:22
#: Merge.rc:51
#, c-format
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr "LANG_FRENCH, SUBLANG_FRENCH"

#. Codepage
#: Merge.rc:23
#: Merge.rc:52
#, c-format
msgid "1252"
msgstr "1252"

#: Merge.rc:72
#: Merge.rc:99
#, c-format
msgid "C&opy to Right"
msgstr "Copier à &droite"

#: Merge.rc:73
#: Merge.rc:100
#, c-format
msgid "Cop&y to Left"
msgstr "Copier à &gauche"

#: Merge.rc:75
#, c-format
msgid "&Select Line Difference"
msgstr "&Sélectionner la différence de ligne"

#: Merge.rc:77
#, c-format
msgid "&Undo"
msgstr "Ann&uler"

#: Merge.rc:78
#, c-format
msgid "&Redo"
msgstr "&Rétablir"

#: Merge.rc:80
#: Merge.rc:102
#, c-format
msgid "Cu&t"
msgstr "&Couper"

#: Merge.rc:81
#: Merge.rc:103
#: Merge.rc:508
#, c-format
msgid "&Copy"
msgstr "Co&pier"

#: Merge.rc:82
#: Merge.rc:104
#, c-format
msgid "&Paste"
msgstr "Co&ller"

#: Merge.rc:84
#: Merge.rc:589
#, c-format
msgid "&Goto..."
msgstr "&Atteindre..."

#: Merge.rc:86
#, c-format
msgid "Op&en"
msgstr "&Ouvrir"

#: Merge.rc:88
#: Merge.rc:531
#: Merge.rc:537
#, c-format
msgid "with &Registered Application"
msgstr "avec le programme associé"

#: Merge.rc:89
#: Merge.rc:532
#: Merge.rc:538
#, c-format
msgid "with &External Editor"
msgstr "avec un éditeur &externe"

#: Merge.rc:90
#: Merge.rc:533
#: Merge.rc:539
#, c-format
msgid "&with..."
msgstr "&avec..."

#: Merge.rc:110
#: Merge.rc:191
#: Merge.rc:312
#, c-format
msgid "&File"
msgstr "&Fichier"

#: Merge.rc:112
#: Merge.rc:193
#: Merge.rc:314
#, c-format
msgid "&New\tCtrl+N"
msgstr "&Nouveau\tCtrl+N"

#: Merge.rc:113
#: Merge.rc:194
#: Merge.rc:315
#, c-format
msgid "&Open...\tCtrl+O"
msgstr "&Ouvrir...\tCtrl+O"

#: Merge.rc:114
#: Merge.rc:195
#: Merge.rc:316
#, c-format
msgid "Op&en Conflict File..."
msgstr "Ouvrir le fichier de conflit..."

#: Merge.rc:116
#: Merge.rc:197
#: Merge.rc:318
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Ouvrir un &projet...\tCtrl+J"

#: Merge.rc:117
#: Merge.rc:198
#: Merge.rc:319
#, c-format
msgid "Sa&ve Project..."
msgstr "Enregistrer le pro&jet..."

#: Merge.rc:119
#, c-format
msgid "Recent Projects"
msgstr "Projets récents"

#: Merge.rc:121
#: Merge.rc:205
#: Merge.rc:351
#, c-format
msgid "E&xit"
msgstr "&Quitter"

#: Merge.rc:123
#: Merge.rc:207
#: Merge.rc:353
#, c-format
msgid "&Edit"
msgstr "&Edition"

#: Merge.rc:125
#: Merge.rc:211
#: Merge.rc:387
#, c-format
msgid "&Options..."
msgstr "&Options..."

#: Merge.rc:127
#: Merge.rc:213
#: Merge.rc:389
#, c-format
msgid "&View"
msgstr "&Affichage"

#: Merge.rc:129
#: Merge.rc:228
#: Merge.rc:391
#, c-format
msgid "Select &Font..."
msgstr "Sélectionner une &police..."

#: Merge.rc:130
#: Merge.rc:229
#: Merge.rc:392
#, c-format
msgid "Use Default F&ont"
msgstr "&Utiliser la police par défaut"

#: Merge.rc:132
#: Merge.rc:231
#: Merge.rc:413
#, c-format
msgid "&Toolbar"
msgstr "Barre d'ou&tils"

#: Merge.rc:134
#: Merge.rc:233
#: Merge.rc:415
#, c-format
msgid "&None"
msgstr "&Aucune"

#: Merge.rc:135
#: Merge.rc:234
#: Merge.rc:416
#, c-format
msgid "&Small"
msgstr "&Petite"

#: Merge.rc:136
#: Merge.rc:235
#: Merge.rc:417
#, c-format
msgid "&Big"
msgstr "&Grande"

#: Merge.rc:138
#: Merge.rc:237
#: Merge.rc:419
#, c-format
msgid "&Status Bar"
msgstr "Barre d'&état"

#: Merge.rc:139
#: Merge.rc:238
#: Merge.rc:420
#, c-format
msgid "Ta&b Bar"
msgstr "Barre d'&onglets"

#: Merge.rc:141
#: Merge.rc:241
#: Merge.rc:424
#, c-format
msgid "&Language..."
msgstr "&Langue..."

#: Merge.rc:143
#: Merge.rc:262
#: Merge.rc:446
#, c-format
msgid "&Tools"
msgstr "&Outils"

#: Merge.rc:145
#: Merge.rc:265
#: Merge.rc:448
#, c-format
msgid "&Filters..."
msgstr "&Filtres..."

#: Merge.rc:146
#: Merge.rc:266
#: Merge.rc:449
#, c-format
msgid "&Generate Patch..."
msgstr "&Générer un patch..."

#: Merge.rc:148
#: Merge.rc:269
#: Merge.rc:452
#, c-format
msgid "&Plugins"
msgstr "&Modules externes"

#: Merge.rc:150
#: Merge.rc:271
#: Merge.rc:454
#, c-format
msgid "&List..."
msgstr "&Liste..."

#: Merge.rc:152
#: Merge.rc:273
#: Merge.rc:456
#, c-format
msgid "&Manual Unpacking"
msgstr "Décompression &manuelle"

#: Merge.rc:153
#: Merge.rc:274
#: Merge.rc:457
#, c-format
msgid "&Automatic Unpacking"
msgstr "Décompression &automatique"

#: Merge.rc:155
#: Merge.rc:276
#: Merge.rc:459
#, c-format
msgid "&Edit with Unpacker"
msgstr "&Éditer avec un décompresseur"

#: Merge.rc:157
#: Merge.rc:278
#: Merge.rc:466
#, c-format
msgid "&Reload plugins"
msgstr "&Recharger les modules externes"

#: Merge.rc:159
#: Merge.rc:280
#: Merge.rc:468
#, c-format
msgid "&Debug"
msgstr "&Déboguer"

#: Merge.rc:161
#: Merge.rc:282
#: Merge.rc:470
#, c-format
msgid "&Load Config..."
msgstr "&Charger la configuration..."

#: Merge.rc:162
#: Merge.rc:283
#: Merge.rc:471
#, c-format
msgid "&Reset Options"
msgstr "&Rétablir les options par défaut"

#: Merge.rc:164
#: Merge.rc:285
#: Merge.rc:473
#, c-format
msgid "&Window"
msgstr "Fe&nêtre"

#: Merge.rc:166
#: Merge.rc:287
#: Merge.rc:475
#, c-format
msgid "Cl&ose"
msgstr "&Fermer"

#: Merge.rc:167
#: Merge.rc:288
#: Merge.rc:476
#, c-format
msgid "Clo&se All"
msgstr "Fermer &tout"

#: Merge.rc:169
#: Merge.rc:290
#: Merge.rc:478
#, c-format
msgid "Change &Pane\tF6"
msgstr "Chan&ger de volet\tF6"

#: Merge.rc:171
#: Merge.rc:292
#: Merge.rc:480
#, c-format
msgid "Tile &Horizontally"
msgstr "Mosaïque &horizontale"

#: Merge.rc:172
#: Merge.rc:293
#: Merge.rc:481
#, c-format
msgid "Tile &Vertically"
msgstr "Mosaïque &verticale"

#: Merge.rc:173
#: Merge.rc:294
#: Merge.rc:482
#, c-format
msgid "&Cascade"
msgstr "&Cascade"

#: Merge.rc:175
#: Merge.rc:296
#: Merge.rc:484
#: Merge.rc:1933
#, c-format
msgid "&Help"
msgstr "A&ide"

#: Merge.rc:177
#: Merge.rc:298
#: Merge.rc:486
#, c-format
msgid "&WinMerge Help\tF1"
msgstr "&Aide WinMerge\tF1"

#: Merge.rc:179
#: Merge.rc:300
#: Merge.rc:488
#, c-format
msgid "R&elease Notes"
msgstr "&Notes de mise à jour"

#: Merge.rc:180
#: Merge.rc:301
#: Merge.rc:489
#, c-format
msgid "&Translations"
msgstr "&Traductions"

#: Merge.rc:181
#: Merge.rc:302
#: Merge.rc:490
#, c-format
msgid "C&onfiguration"
msgstr "&Configuration"

#: Merge.rc:182
#: Merge.rc:303
#: Merge.rc:491
#, c-format
msgid "A&rchive Support disabled..."
msgstr "&Support d'archives désactivé..."

#: Merge.rc:184
#: Merge.rc:305
#: Merge.rc:493
#, c-format
msgid "&GNU General Public License"
msgstr "&Licence publique générale GNU"

#: Merge.rc:185
#: Merge.rc:306
#: Merge.rc:494
#, c-format
msgid "&About WinMerge..."
msgstr "&A propos de WinMerge..."

#: Merge.rc:200
#: Merge.rc:337
#, c-format
msgid "L&eft Read-only"
msgstr "Volet gauc&he lecture seulement"

#: Merge.rc:201
#: Merge.rc:338
#, c-format
msgid "Ri&ght Read-only"
msgstr "Volet droi&t  lecture seulement"

#: Merge.rc:203
#, c-format
msgid "File En&coding"
msgstr "Encodage des fic&hier"

#: Merge.rc:209
#: Merge.rc:363
#, c-format
msgid "Select &All\tCtrl+A"
msgstr "Sélectionner &tout\tCtrl+A"

#: Merge.rc:215
#, c-format
msgid "Show &Identical Items"
msgstr "Eléments &identiques"

#: Merge.rc:216
#, c-format
msgid "Show &Different Items"
msgstr "Eléments &différents"

#: Merge.rc:217
#, c-format
msgid "Show L&eft Unique Items"
msgstr "Eléments uniques (volet gauche)"

#: Merge.rc:218
#, c-format
msgid "Show Ri&ght Unique Items"
msgstr "Eléments uniques (volet droit)"

#: Merge.rc:219
#, c-format
msgid "Show S&kipped Items"
msgstr "Fichiers ig&norés"

#: Merge.rc:220
#, c-format
msgid "S&how Binary Files"
msgstr "Fichiers &binaires"

#: Merge.rc:222
#, c-format
msgid "Show Hidd&en Items"
msgstr "Eléments cachés"

#: Merge.rc:224
#, c-format
msgid "Tree &Mode"
msgstr "Arborescence"

#: Merge.rc:225
#, c-format
msgid "E&xpand All Subfolders"
msgstr "Développ&er tous les sous-répertoires"

#: Merge.rc:226
#, c-format
msgid "&Collapse All Subfolders"
msgstr "&Fermer tous les sous-répertoires"

#: Merge.rc:239
#, c-format
msgid "Compa&re Statistics"
msgstr "Statistiques de comparaison"

#: Merge.rc:243
#: Merge.rc:426
#, c-format
msgid "Refre&sh\tF5"
msgstr "&Actualiser\tF5"

#: Merge.rc:244
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
msgstr "Actualiser la &sélection\tCtrl+F5"

#: Merge.rc:246
#: Merge.rc:428
#, c-format
msgid "&Merge"
msgstr "Fu&sionner"

#: Merge.rc:248
#, c-format
msgid "Co&mpare\tEnter"
msgstr "Co&mparer\tEntrée"

#: Merge.rc:250
#: Merge.rc:430
#, c-format
msgid "&Next Difference\tAlt+Down"
msgstr "Différence &suivante\tAlt+Down"

#: Merge.rc:251
#: Merge.rc:431
#, c-format
msgid "&Previous Difference\tAlt+Up"
msgstr "Différence &précédente\tAlt+Up"

#: Merge.rc:253
#: Merge.rc:433
#, c-format
msgid "&First Difference\tAlt+Home"
msgstr "P&remière différence\tAlt+Home"

#: Merge.rc:254
#: Merge.rc:434
#, c-format
msgid "&Current Difference\tAlt+Enter"
msgstr "Différence active\tAlt+Enter"

#: Merge.rc:255
#: Merge.rc:435
#, c-format
msgid "&Last Difference\tAlt+End"
msgstr "&Dernière différence\tAlt+End"

#: Merge.rc:257
#: Merge.rc:437
#, c-format
msgid "Copy to &Right\tAlt+Right"
msgstr "Copier à dr&oite\tAlt+Right"

#: Merge.rc:258
#: Merge.rc:438
#, c-format
msgid "Copy to L&eft\tAlt+Left"
msgstr "Copier à ga&uche\tAlt+Left"

#: Merge.rc:260
#, c-format
msgid "&Delete\tDel"
msgstr "Su&pprimer\tDel"

#: Merge.rc:264
#: Merge.rc:562
#, c-format
msgid "&Customize Columns..."
msgstr "&Personnaliser les colonnes..."

#: Merge.rc:267
#: Merge.rc:450
#, c-format
msgid "Generate &Report..."
msgstr "Générer un &compte-rendu..."

#: Merge.rc:321
#, c-format
msgid "&Save\tCtrl+S"
msgstr "&Enregistrer\tCtrl+S"

#: Merge.rc:322
#, c-format
msgid "Save &Left"
msgstr "Enregistrer à &gauche"

#: Merge.rc:324
#: Merge.rc:329
#, c-format
msgid "&Save"
msgstr "&Enregistrer"

#: Merge.rc:325
#: Merge.rc:330
#, c-format
msgid "Save &As..."
msgstr "Enregistrer &sous..."

#: Merge.rc:327
#, c-format
msgid "Save &Right"
msgstr "Enregistrer à &droite"

#: Merge.rc:333
#, c-format
msgid "&Print..."
msgstr "&Imprimer..."

#: Merge.rc:334
#, c-format
msgid "Page Se&tup"
msgstr "&Mise en page"

#: Merge.rc:335
#, c-format
msgid "Print Previe&w"
msgstr "&Aperçu avant impression"

#: Merge.rc:340
#, c-format
msgid "&Convert Line Endings to"
msgstr "&Convertir les fins de ligne"

#: Merge.rc:342
#, c-format
msgid "&Windows (CRLF)"
msgstr "&Windows (CRLF)"

#: Merge.rc:343
#, c-format
msgid "&Unix (LF)"
msgstr "&Unix (LF)"

#: Merge.rc:344
#, c-format
msgid "&Mac (CR)"
msgstr "&Mac (CR)"

#: Merge.rc:347
#, c-format
msgid "&Merge Mode\tF9"
msgstr "Mode de fusion\tF9"

#: Merge.rc:349
#, c-format
msgid "&File Encoding..."
msgstr "Encodage de fic&hier"

#: Merge.rc:355
#, c-format
msgid "&Undo\tCtrl+Z"
msgstr "Ann&uler\tCtrl+Z"

#: Merge.rc:356
#, c-format
msgid "&Redo\tCtrl+Y"
msgstr "&Rétablir\tCtrl+Y"

#: Merge.rc:358
#, c-format
msgid "Cu&t\tCtrl+X"
msgstr "&Couper\tCtrl+X"

#: Merge.rc:359
#, c-format
msgid "&Copy\tCtrl+C"
msgstr "Cop&ier\tCtrl+C"

#: Merge.rc:360
#, c-format
msgid "&Paste\tCtrl+V"
msgstr "Co&ller\tCtrl+V"

#: Merge.rc:362
#, c-format
msgid "Select Line &Difference\tF4"
msgstr "&Sélectionner la distinction\tF4"

#: Merge.rc:365
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "Rec&hercher...\tCtrl+F"

#: Merge.rc:366
#, c-format
msgid "Repla&ce...\tCtrl+H"
msgstr "Re&mplacer...\tCtrl+H"

#: Merge.rc:368
#, c-format
msgid "&Scripts"
msgstr "Scripts"

#: Merge.rc:370
#: Merge.rc:2789
#, c-format
msgid "< Empty >"
msgstr "< Vide >"

#: Merge.rc:373
#, c-format
msgid "Advanced"
msgstr "A&vancé"

#: Merge.rc:375
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "&Copier avec des numéros de ligne\tCtrl+Shift+C"

#: Merge.rc:378
#, c-format
msgid "&Bookmarks"
msgstr "Si&gnets"

#: Merge.rc:380
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "Ajouter/&supprimer un signet\tCtrl+F2"

#: Merge.rc:381
#, c-format
msgid "&Next Bookmark\tF2"
msgstr "Signet &suivant\tF2"

#: Merge.rc:382
#, c-format
msgid "&Previous bookmark\tShift+F2"
msgstr "Signet &précédent\tShift+F2"

#: Merge.rc:383
#, c-format
msgid "&Clear All Bookmarks"
msgstr "&Effacer tous les signets"

#: Merge.rc:385
#, c-format
msgid "&Go To...\tCtrl+G"
msgstr "&Atteindre...\tCtrl+G"

#: Merge.rc:393
#, c-format
msgid "&Zoom"
msgstr "&Zoom"

#: Merge.rc:395
#, c-format
msgid "Zoom &In\tCtrl++"
msgstr "Zoom a&vant\tCtrl++"

#: Merge.rc:396
#, c-format
msgid "Zoom &Out\tCtrl+-"
msgstr "Zoom a&rrière\tCtrl+-"

#. Zoom to normal
#: Merge.rc:397
#, c-format
msgid "&Normal\tCtrl+*"
msgstr "&Normal\tCtrl+*"

#: Merge.rc:399
#, c-format
msgid "Syntax Highlight"
msgstr "&Coloration de la syntaxe"

#: Merge.rc:404
#, c-format
msgid "&Lock Panes"
msgstr "&Verrouiller les volets"

#: Merge.rc:405
#, c-format
msgid "&View Whitespace"
msgstr "Afficher les &espaces"

#: Merge.rc:406
#, c-format
msgid "Vie&w Line Differences"
msgstr "Afficher les différence de lignes"

#: Merge.rc:407
#, c-format
msgid "View Line &Numbers"
msgstr "Afficher les &numéros de lignes"

#: Merge.rc:408
#, c-format
msgid "View &Margins"
msgstr "Afficher les &marges"

#: Merge.rc:409
#, c-format
msgid "W&rap Lines"
msgstr "&Retour à la ligne automatique"

#: Merge.rc:411
#, c-format
msgid "Sw&ap Panes"
msgstr "&Intervertir les volets"

#: Merge.rc:421
#, c-format
msgid "Diff &Pane"
msgstr "&Volet des différences"

#: Merge.rc:422
#, c-format
msgid "Lo&cation Pane"
msgstr "Volet d'emplacement"

#: Merge.rc:440
#, c-format
msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
msgstr "Copier à droite et a&vancer\tAlt+Ctrl+Droite"

#: Merge.rc:441
#, c-format
msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
msgstr "Copier à gauche et av&ancer\tAlt+Ctrl+Gauche"

#: Merge.rc:443
#, c-format
msgid "Copy &All to Right"
msgstr "Cop&ier tout à droite"

#: Merge.rc:444
#, c-format
msgid "Cop&y All to Left"
msgstr "Copi&er tout à gauche"

#: Merge.rc:461
#, c-format
msgid "&Prediffer"
msgstr "&Pré-comparer"

#: Merge.rc:502
#, c-format
msgid "Comp&are"
msgstr "Co&mparer"

#: Merge.rc:503
#, c-format
msgid "Co&mpare Special"
msgstr "Comparaison sp&éciale"

#: Merge.rc:505
#, c-format
msgid "&XML"
msgstr "&XML"

#: Merge.rc:510
#, c-format
msgid "&Left to Right"
msgstr "de &gauche à droite"

#: Merge.rc:511
#, c-format
msgid "L&eft to..."
msgstr "de g&auche à..."

#: Merge.rc:512
#, c-format
msgid "&Right to Left"
msgstr "de &droite à gauche"

#: Merge.rc:513
#, c-format
msgid "R&ight to..."
msgstr "de d&roite à..."

#: Merge.rc:515
#, c-format
msgid "&Move"
msgstr "Dé&placer"

#: Merge.rc:517
#, c-format
msgid "&Left to..."
msgstr "de g&auche à..."

#: Merge.rc:518
#, c-format
msgid "&Right to..."
msgstr "de d&roite à..."

#: Merge.rc:520
#, c-format
msgid "&Delete"
msgstr "&Supprimer"

#: Merge.rc:522
#: Merge.rc:1135
#: Merge.rc:1517
#, c-format
msgid "&Left"
msgstr "à &gauche"

#: Merge.rc:523
#: Merge.rc:1137
#: Merge.rc:1520
#, c-format
msgid "&Right"
msgstr "à &droite"

#: Merge.rc:524
#, c-format
msgid "&Both"
msgstr "les deu&x côtés"

#: Merge.rc:526
#, c-format
msgid "Re&name"
msgstr "Re&nommer"

#: Merge.rc:527
#, c-format
msgid "&Hide Items"
msgstr "&Masquer l'élément(s)"

#: Merge.rc:529
#, c-format
msgid "&Open Left"
msgstr "Ouvrir à &gauche"

#: Merge.rc:535
#, c-format
msgid "O&pen Right"
msgstr "Ouvrir à &droite"

#: Merge.rc:542
#, c-format
msgid "Cop&y Pathnames"
msgstr "Copier les c&hemins complets"

#: Merge.rc:544
#, c-format
msgid "&Left (%1 of %2)"
msgstr "de &gauche (%1 de %2)"

#: Merge.rc:545
#, c-format
msgid "&Right (%1 of %2)"
msgstr "de &droite (%1 de %2)"

#: Merge.rc:546
#, c-format
msgid "&Both (%1 of %2)"
msgstr "des deu&x côtés (%1 de %2)"

#: Merge.rc:548
#, c-format
msgid "Copy &Filenames"
msgstr "Copier les noms de &fichier"

#: Merge.rc:550
#, c-format
msgid "&Zip"
msgstr "Co&mpresser"

#: Merge.rc:552
#, c-format
msgid "&Left... (%1 of %2)"
msgstr "à &gauche... (%1 de %2)"

#: Merge.rc:553
#, c-format
msgid "&Right... (%1 of %2)"
msgstr "à &droite... (%1 de %2)"

#: Merge.rc:554
#, c-format
msgid "&Both... (%1 of %2)"
msgstr "les deu&x côtés... (%1 de %2)"

#: Merge.rc:555
#, c-format
msgid "&Differences... (%1 of %2)"
msgstr "les di&fférences...(%1 de %2)"

#: Merge.rc:558
#, c-format
msgid "&Refresh"
msgstr "&Actualiser"

#: Merge.rc:570
#, c-format
msgid "&Copy Full Path"
msgstr "Copier le c&hemin complet"

#: Merge.rc:571
#, c-format
msgid "Copy &Filename"
msgstr "Copier le nom de &fichier"

#: Merge.rc:577
#, c-format
msgid "Prediffer Settings"
msgstr "Options de pré-comparaison"

#: Merge.rc:579
#, c-format
msgid "&No prediffer"
msgstr "Au&cune"

#: Merge.rc:580
#, c-format
msgid "Auto prediffer"
msgstr "Au&tomatique"

#: Merge.rc:588
#, c-format
msgid "G&oto Diff"
msgstr "Atteindre une différence"

#: Merge.rc:591
#, c-format
msgid "&No Moved Blocks"
msgstr "&Ne pas afficher les blocs déplacés"

#: Merge.rc:592
#, c-format
msgid "&All Moved Blocks"
msgstr "&Afficher tous les blocs déplacés"

#: Merge.rc:593
#, c-format
msgid "Moved Block for &Current Diff"
msgstr "Afficher le bloc déplacé de la différence &active"

#: Merge.rc:662
#, c-format
msgid "About WinMerge"
msgstr "A propos de WinMerge"

#: Merge.rc:668
#, c-format
msgid "(Private Build)"
msgstr "(Compilation personnalisée)"

#: Merge.rc:669
#, c-format
msgid "All rights reserved."
msgstr "Tous droits réservés."

#: Merge.rc:670
#, c-format
msgid "Visit the WinMerge HomePage!"
msgstr "Visitez la page d'accueil de WinMerge !"

#: Merge.rc:673
#: Merge.rc:705
#: Merge.rc:797
#: Merge.rc:983
#: Merge.rc:1054
#: Merge.rc:1083
#: Merge.rc:1093
#: Merge.rc:1259
#: Merge.rc:1323
#: Merge.rc:1336
#: Merge.rc:1428
#: Merge.rc:1443
#: Merge.rc:1665
#, c-format
msgid "OK"
msgstr "OK"

#: Merge.rc:674
#, c-format
msgid "Contributors"
msgstr "Contributeurs"

#: Merge.rc:681
#, c-format
msgid "Select Files or Folders"
msgstr "Sélection des fichiers ou des dossiers..."

#: Merge.rc:684
#: Merge.rc:1594
#, c-format
msgid "&Left:"
msgstr "&Gauche:"

#: Merge.rc:688
#: Merge.rc:749
#: Merge.rc:997
#: Merge.rc:1019
#, c-format
msgid "&Browse..."
msgstr "P&arcourir..."

#: Merge.rc:689
#: Merge.rc:1598
#, c-format
msgid "&Right:"
msgstr "&Droite:"

#: Merge.rc:693
#: Merge.rc:1030
#, c-format
msgid "Bro&wse..."
msgstr "Pa&rcourir..."

#: Merge.rc:694
#: Merge.rc:1602
#, c-format
msgid "&Filter:"
msgstr "&Filtre:"

#: Merge.rc:697
#: Merge.rc:1604
#, c-format
msgid "Select..."
msgstr "&Sélection..."

#: Merge.rc:698
#, c-format
msgid "&Unpacker:"
msgstr "Décom&pres."

#: Merge.rc:701
#, c-format
msgid "&Select..."
msgstr "&Sélection..."

#: Merge.rc:702
#: Merge.rc:1605
#, c-format
msgid "&Include Subfolders"
msgstr "&Inclure les sous-dossiers"

#: Merge.rc:704
#, c-format
msgid "Status:"
msgstr "Etat:"

#: Merge.rc:706
#: Merge.rc:736
#: Merge.rc:798
#: Merge.rc:828
#: Merge.rc:860
#: Merge.rc:870
#: Merge.rc:1055
#: Merge.rc:1084
#: Merge.rc:1094
#: Merge.rc:1145
#: Merge.rc:1260
#: Merge.rc:1337
#: Merge.rc:1429
#: Merge.rc:1444
#: Merge.rc:1666
#, c-format
msgid "Cancel"
msgstr "Ann&uler"

#: Merge.rc:707
#: Merge.rc:1338
#, c-format
msgid "Help"
msgstr "Aide"

#: Merge.rc:708
#, c-format
msgid "Files or Folders to Compare"
msgstr "Fichiers ou dossiers à comparer :"

#: Merge.rc:715
#, c-format
msgid "Visual SourceSafe"
msgstr "Visual SourceSafe"

#: Merge.rc:720
#, c-format
msgid "Database:"
msgstr "Base de données:"

#: Merge.rc:723
#, c-format
msgid "Project:"
msgstr "&Projet:"

#: Merge.rc:726
#, c-format
msgid "User:"
msgstr "Utilisateur:"

#: Merge.rc:728
#, c-format
msgid "Password:"
msgstr "&Mot de passe:"

#: Merge.rc:730
#, c-format
msgid "Link to Destination VSS project"
msgstr "&Lien vers le projet de destination VSS"

#: Merge.rc:732
#: Merge.rc:875
#, c-format
msgid "Apply to all items"
msgstr "&Appliquer à tous les éléments"

#: Merge.rc:734
#, c-format
msgid "Check Out"
msgstr "Vérifier"

#: Merge.rc:735
#: Merge.rc:871
#, c-format
msgid "Save As..."
msgstr "Enregis. &sous"

#: Merge.rc:741
#, c-format
msgid "Versioning System"
msgstr "Contrôle de version"

#: Merge.rc:744
#, c-format
msgid "&Versioning System:"
msgstr "&Système utilisé:"

#: Merge.rc:747
#: Merge.rc:2065
#, c-format
msgid "&Path to cleartool.exe:"
msgstr "&Emplacement de cleartool.exe:"

#: Merge.rc:754
#: Merge.rc:1941
#, c-format
msgid "General"
msgstr "Général"

#: Merge.rc:757
#, c-format
msgid "Automatically &scroll to first difference"
msgstr "&Atteindre automatiquement la première différence"

#: Merge.rc:760
#, c-format
msgid "&Disable Splash Screen"
msgstr "&Désactiver l'écran d'accueil"

#: Merge.rc:762
#, c-format
msgid "Cl&ose windows with ESC"
msgstr "Fermer les fenêtres avec la &touche ESC"

#: Merge.rc:764
#, c-format
msgid "&Automatically verify paths in Open-dialog"
msgstr "&Vérification automatique des emplacements à l'ouverture"

#: Merge.rc:767
#, c-format
msgid "All&ow only one instance to run"
msgstr "&Permettre une seule instance en exécution"

#: Merge.rc:769
#, c-format
msgid "As&k when closing multiple windows"
msgstr "&Confirmer la fermeture de plusieurs fenêtres"

#: Merge.rc:771
#, c-format
msgid "&Preserve file time in file compare"
msgstr "Conserver la date et l'heure lors des comparaisons de fichiers"

#: Merge.rc:774
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
msgstr "Afficher l'invite à la sélection de fichiers ou dossiers au démarrage"

#: Merge.rc:776
#, c-format
msgid "O&pen-dialog Auto-Completion:"
msgstr "Remplissage automatique à l'ouverture:"

#: Merge.rc:779
#, c-format
msgid "Enable multiple compare windows for"
msgstr "Activer plusieurs fenêtres de pour"

#: Merge.rc:781
#: Merge.rc:1617
#, c-format
msgid "&Folder compare"
msgstr "Comparaison de &dossiers"

#: Merge.rc:783
#: Merge.rc:1619
#, c-format
msgid "Fil&e compare"
msgstr "Comparaison de &fichiers"

#: Merge.rc:785
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
msgstr "WinMerge permet de masquer certains messages d'information. Cliquer sur le bouton Réinitialiser pour les rendre visibles à nouveau."

#: Merge.rc:787
#, c-format
msgid "Reset"
msgstr "&Réinitialiser"

#: Merge.rc:794
#, c-format
msgid "Language"
msgstr "Langue"

#: Merge.rc:801
#, c-format
msgid "Available languages:"
msgstr "Langues disponibles :"

#: Merge.rc:807
#, c-format
msgid "Find"
msgstr "Rechercher"

#: Merge.rc:810
#: Merge.rc:837
#, c-format
msgid "Fi&nd what:"
msgstr "&Rechercher:"

#: Merge.rc:813
#: Merge.rc:843
#, c-format
msgid "Match &whole word only"
msgstr "&Mot entier uniquement"

#: Merge.rc:815
#: Merge.rc:845
#, c-format
msgid "Match &case"
msgstr "Respecter la &casse"

#: Merge.rc:817
#: Merge.rc:847
#, c-format
msgid "Regular &expression"
msgstr "E&xpressions régulières"

#: Merge.rc:819
#, c-format
msgid "D&on't wrap end of file"
msgstr "Aucun retour de ligne automatique"

#: Merge.rc:822
#, c-format
msgid "Direction"
msgstr "Sens"

#: Merge.rc:823
#, c-format
msgid "&Up"
msgstr "Vers le &haut"

#: Merge.rc:825
#, c-format
msgid "&Down"
msgstr "Vers le &bas"

#: Merge.rc:827
#: Merge.rc:857
#, c-format
msgid "&Find Next"
msgstr "&Suivant"

#: Merge.rc:834
#, c-format
msgid "Replace"
msgstr "Remplacer"

#: Merge.rc:840
#, c-format
msgid "Re&place with:"
msgstr "Rem&placer par:"

#: Merge.rc:849
#, c-format
msgid "&Don't wrap end of file"
msgstr "&Aucun retour de ligne en fin de fichier"

#: Merge.rc:852
#, c-format
msgid "Replace in"
msgstr "Remplacer dans"

#: Merge.rc:853
#, c-format
msgid "&Selection"
msgstr "Sé&lection"

#: Merge.rc:855
#, c-format
msgid "Wh&ole file"
msgstr "Fichier entier"

#: Merge.rc:858
#, c-format
msgid "&Replace"
msgstr "&Remplacer"

#: Merge.rc:859
#, c-format
msgid "Replace &All"
msgstr "Remplacer &tout"

#: Merge.rc:866
#: Merge.rc:2187
#, c-format
msgid "Rational ClearCase"
msgstr "Rational ClearCase"

#: Merge.rc:869
#, c-format
msgid "CheckOut"
msgstr "&Vérifier"

#: Merge.rc:874
#: Merge.rc:1179
#, c-format
msgid "Comments"
msgstr "Commentaires"

#: Merge.rc:877
#, c-format
msgid "CheckIn after checkout"
msgstr "Inscrire après vérification"

#: Merge.rc:883
#, c-format
msgid "Linefilters"
msgstr "Filtres de lignes"

#: Merge.rc:886
#, c-format
msgid "Enable Line Filters"
msgstr "Activer le fitrage des lignes"

#: Merge.rc:889
#, c-format
msgid "Regular Expressions (one per line):"
msgstr "Expressions régulières (une par ligne)"

#: Merge.rc:896
#, c-format
msgid "Save"
msgstr "Enregister"

#: Merge.rc:897
#, c-format
msgid "New"
msgstr "Nouveau"

#: Merge.rc:898
#, c-format
msgid "Edit"
msgstr "Editer"

#: Merge.rc:899
#, c-format
msgid "Remove"
msgstr "Supprimer"

#: Merge.rc:904
#: Merge.rc:1944
#, c-format
msgid "Colors"
msgstr "Couleurs"

#: Merge.rc:907
#, c-format
msgid "Difference:"
msgstr "Différence:"

#: Merge.rc:911
#, c-format
msgid "Selected Difference:"
msgstr "Différence sélectionnée :"

#: Merge.rc:915
#: Merge.rc:1569
#, c-format
msgid "Background"
msgstr "Arrière-plan"

#: Merge.rc:916
#, c-format
msgid "Deleted"
msgstr "Supprimé"

#: Merge.rc:929
#: Merge.rc:1364
#: Merge.rc:1570
#, c-format
msgid "Text"
msgstr "Texte"

#: Merge.rc:933
#, c-format
msgid "Ignored Difference:"
msgstr "Différence ignorée:"

#: Merge.rc:943
#, c-format
msgid "Moved:"
msgstr "Déplacé:"

#: Merge.rc:953
#, c-format
msgid "Selected Moved:"
msgstr "Déplacé sélectionné:"

#: Merge.rc:960
#, c-format
msgid "Word Difference:"
msgstr "Différence de mot:"

#: Merge.rc:967
#, c-format
msgid "Selected Word Diff:"
msgstr "Différence de mot sélectionnée:"

#: Merge.rc:974
#: Merge.rc:1053
#: Merge.rc:1082
#: Merge.rc:1182
#: Merge.rc:1410
#, c-format
msgid "Defaults"
msgstr "Par défaut"

#: Merge.rc:980
#: Merge.rc:1352
#: Merge.rc:1558
#, c-format
msgid "Dialog"
msgstr "Dialogue"

#: Merge.rc:990
#: Merge.rc:1947
#, c-format
msgid "System"
msgstr "Système"

#: Merge.rc:993
#, c-format
msgid "&Send deleted files to Recycle Bin"
msgstr "&Déplacer les fichiers supprimés vers la corbeille"

#: Merge.rc:995
#, c-format
msgid "&External editor:"
msgstr "E&diteur externe:"

#: Merge.rc:998
#, c-format
msgid "&Filter folder:"
msgstr "&Dossier des filtres:"

#: Merge.rc:1000
#, c-format
msgid "B&rowse..."
msgstr "Parc&ourir..."

#: Merge.rc:1001
#, c-format
msgid "Temporary files folder"
msgstr "Dossier temporaire"

#: Merge.rc:1002
#, c-format
msgid "S&ystem's temp folder"
msgstr "Dossier temporaire système"

#: Merge.rc:1004
#, c-format
msgid "C&ustom folder:"
msgstr "Dossier personnalisé:"

#: Merge.rc:1007
#: Merge.rc:1023
#, c-format
msgid "Br&owse..."
msgstr "P&arcourir..."

#: Merge.rc:1013
#, c-format
msgid "Patch Generator"
msgstr "Générateur de patch"

#: Merge.rc:1016
#, c-format
msgid "File&1:"
msgstr "Fichier&1:"

#: Merge.rc:1020
#, c-format
msgid "File&2:"
msgstr "Fichier&2:"

#: Merge.rc:1024
#, c-format
msgid "&Swap"
msgstr "&Intervertir"

#: Merge.rc:1025
#, c-format
msgid "&Append to existing file"
msgstr "A&jouter au fichier existant"

#: Merge.rc:1027
#, c-format
msgid "&Result:"
msgstr "Ré&sultat:"

#: Merge.rc:1031
#, c-format
msgid "&Format"
msgstr "&Format"

#: Merge.rc:1032
#, c-format
msgid "St&yle:"
msgstr "St&yle:"

#: Merge.rc:1035
#, c-format
msgid "&Context:"
msgstr "&Contexte:"

#: Merge.rc:1038
#, c-format
msgid "W&hitespaces"
msgstr "Espaces"

#: Merge.rc:1039
#, c-format
msgid "Com&pare"
msgstr "C&omparer"

#: Merge.rc:1041
#, c-format
msgid "I&gnore changes"
msgstr "Ignorer les modifications"

#: Merge.rc:1043
#, c-format
msgid "Ig&nore all"
msgstr "Ignorer &tout"

#: Merge.rc:1045
#, c-format
msgid "Ignor&e blank lines"
msgstr "Ignorer les lignes &vierges"

#: Merge.rc:1047
#, c-format
msgid "Case sensi&tive"
msgstr "Respecter la casse"

#: Merge.rc:1049
#, c-format
msgid "Inclu&de command line"
msgstr "Inclure une ligne de co&mmande"

#: Merge.rc:1051
#, c-format
msgid "Open to e&xternal editor"
msgstr "Ouvrir avec l'éditeur e&xterne"

#: Merge.rc:1073
#, c-format
msgid "Display Columns"
msgstr "Afficher les colonnes"

#: Merge.rc:1079
#, c-format
msgid "Move &Up"
msgstr "&Monter"

#: Merge.rc:1080
#, c-format
msgid "Move &Down"
msgstr "&Descendre"

#: Merge.rc:1090
#, c-format
msgid "Select Unpacker"
msgstr "Sélectionner un décompresseur"

#: Merge.rc:1095
#, c-format
msgid "File unpacker:"
msgstr "Décompresseur:"

#: Merge.rc:1098
#, c-format
msgid "Display all unpackers, don't check the extension"
msgstr "Afficher tous les décompresseurs, ne pas vérifier les extensions"

#: Merge.rc:1101
#, c-format
msgid "Extensions list:"
msgstr "Extensions:"

#: Merge.rc:1102
#, c-format
msgid "Description:"
msgstr "Description:"

#: Merge.rc:1113
#, c-format
msgid " Folder Compare Progress"
msgstr "Progression de la comparaison"

#: Merge.rc:1116
#: Merge.rc:1894
#, c-format
msgid "Stop"
msgstr "Arrêter"

#: Merge.rc:1121
#, c-format
msgid "Comparing items..."
msgstr "Comparaison des éléments..."

#: Merge.rc:1122
#, c-format
msgid "Items compared:"
msgstr "Éléments comparés:"

#: Merge.rc:1123
#, c-format
msgid "Items total:"
msgstr "Éléments au total:"

#: Merge.rc:1129
#, c-format
msgid "Go To"
msgstr "Atteindre"

#: Merge.rc:1132
#, c-format
msgid "G&oto:"
msgstr "A&tteindre:"

#: Merge.rc:1134
#, c-format
msgid "File"
msgstr "Fichier"

#: Merge.rc:1139
#, c-format
msgid "Goto what"
msgstr "Atteindre:"

#: Merge.rc:1140
#, c-format
msgid "Li&ne"
msgstr "&Ligne"

#: Merge.rc:1142
#, c-format
msgid "&Difference"
msgstr "Di&fférence"

#: Merge.rc:1144
#, c-format
msgid "&Go To"
msgstr "&Atteindre"

#: Merge.rc:1150
#: Merge.rc:1942
#, c-format
msgid "Compare"
msgstr "Comparaison"

#: Merge.rc:1153
#, c-format
msgid "Whitespace"
msgstr "Espaces"

#: Merge.rc:1154
#, c-format
msgid "&Compare"
msgstr "C&omparer"

#: Merge.rc:1156
#, c-format
msgid "&Ignore change"
msgstr "Ignorer la modification"

#: Merge.rc:1158
#, c-format
msgid "I&gnore all"
msgstr "Ignorer tout"

#: Merge.rc:1160
#, c-format
msgid "Ignore blan&k lines"
msgstr "Ignorer les lignes &vierges"

#: Merge.rc:1162
#, c-format
msgid "Ignore &case"
msgstr "Ignorer la ca&sse"

#: Merge.rc:1164
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgstr "Ignorer les retours de ligne (Windows/Unix/Mac)"

#: Merge.rc:1167
#, c-format
msgid "E&nable moved block detection"
msgstr "&Activer la détection des blocs déplacés"

#: Merge.rc:1169
#, c-format
msgid "&Match similar lines"
msgstr "Faire correspondre les &lignes identiques"

#: Merge.rc:1171
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr "I&gnorer les différences de temps de moins de 3 secondes"

#: Merge.rc:1174
#, c-format
msgid "&File Compare method:"
msgstr "&Méthode de comparaison:"

#: Merge.rc:1177
#, c-format
msgid "S&top after first difference"
msgstr "&Arrêter à la première différence"

#: Merge.rc:1180
#, c-format
msgid "Filter Comments"
msgstr "Filtrer les commentaires"

#: Merge.rc:1187
#: Merge.rc:1943
#, c-format
msgid "Editor"
msgstr "Éditeur"

#: Merge.rc:1190
#, c-format
msgid "&Highlight syntax"
msgstr "&Colorer la syntaxe"

#: Merge.rc:1192
#, c-format
msgid "&Automatic rescan"
msgstr "&Actualisation automatique"

#: Merge.rc:1194
#, c-format
msgid "&Preserve original EOL chars"
msgstr "&Conserver les caractères de fin de ligne (EOL) originaux"

#: Merge.rc:1196
#, c-format
msgid "Tabs"
msgstr "Tabulations"

#: Merge.rc:1197
#, c-format
msgid "&Tab size:"
msgstr "Tai&lle des tabulations:"

#: Merge.rc:1200
#, c-format
msgid "&Insert Tabs"
msgstr "Insérer des &tabulations"

#: Merge.rc:1202
#, c-format
msgid "Insert &Spaces"
msgstr "Insérer des &espaces"

#: Merge.rc:1204
#, c-format
msgid "Line Difference Coloring"
msgstr "Colorisation des différences de ligne"

#: Merge.rc:1206
#, c-format
msgid "View line differences"
msgstr "A&fficher les différences de ligne"

#: Merge.rc:1208
#, c-format
msgid "&Character level"
msgstr "Au caractère près"

#: Merge.rc:1210
#, c-format
msgid "&Word-level:"
msgstr "Au mot près"

#: Merge.rc:1225
#, c-format
msgid "Filefilters"
msgstr "Filtre de fichiers"

#: Merge.rc:1231
#, c-format
msgid "Test"
msgstr "Test"

#: Merge.rc:1232
#, c-format
msgid "Install..."
msgstr "Installer..."

#: Merge.rc:1233
#, c-format
msgid "New..."
msgstr "&Nouveau..."

#: Merge.rc:1234
#, c-format
msgid "Edit..."
msgstr "É&diter..."

#: Merge.rc:1235
#, c-format
msgid "Delete..."
msgstr "&Supprimer..."

#: Merge.rc:1241
#, c-format
msgid "Save modified files?"
msgstr "Enregister les fichiers modifiés ?"

#: Merge.rc:1244
#, c-format
msgid "Left side file"
msgstr "Fichier du côté gauche"

#: Merge.rc:1247
#, c-format
msgid "&Save changes"
msgstr "&Enregister les modifications"

#: Merge.rc:1249
#, c-format
msgid "&Discard changes"
msgstr "&Ignorer les modifications"

#: Merge.rc:1251
#, c-format
msgid "Right side file"
msgstr "Fichier du côté droit"

#: Merge.rc:1254
#, c-format
msgid "S&ave changes"
msgstr "E&nregister les modifications"

#: Merge.rc:1256
#, c-format
msgid "Dis&card changes"
msgstr "Abandonner les modifications"

#: Merge.rc:1258
#, c-format
msgid "Discard All"
msgstr "Abandonner tout"

#: Merge.rc:1265
#: Merge.rc:1513
#: Merge.rc:1949
#, c-format
msgid "Codepage"
msgstr "Encodage"

#: Merge.rc:1268
#, c-format
msgid "Default Codepage"
msgstr "Encodage par défaut"

#: Merge.rc:1269
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr "Sélectionnez l'encodage qui sera utilisé par défaut lors du chargement de fichiers non-Unicode:"

#: Merge.rc:1271
#, c-format
msgid ""
"Detect codepage info for these files: .html, .rc, .xml \n"
"need to restart session"
msgstr ""
"&Détecter l'encodage pour les fichiers suivants :\.html, .rc, .xml \n"
"nécessite un redémarrage de session"

#: Merge.rc:1274
#, c-format
msgid "System codepage"
msgstr "Encodage &système"

#: Merge.rc:1276
#, c-format
msgid "According to WinMerge User Interface"
msgstr "Conformément à l'&interface utilisateur de WinMerge"

#: Merge.rc:1278
#, c-format
msgid "Custom codepage:"
msgstr "Encodage personnalisé:"

#: Merge.rc:1286
#, c-format
msgid "WinMerge - Archive support disabled"
msgstr "WinMerge - Support des archives désactivé"

#: Merge.rc:1289
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr "Version 7-Zip introuvable (non installé ?)"

#: Merge.rc:1292
#, c-format
msgid ""
"Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
"essential components to be copied to the program directory for standalone operation."
msgstr ""
"Pour  le support des archives, il faut que 7-Zip 3.11 ou supérieur soit installé \n"
"ou, que ses composants essentiels pour un usage autonome soient copiés dans le dossier du programme."

#: Merge.rc:1294
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr "De plus le module d'interface approprié(Merge7z*.dll) doit être présent."

#: Merge.rc:1296
#, c-format
msgid ""
"Please use the version of 7-Zip recommended below until interface plugins for later\n"
"versions become available."
msgstr ""
"Veuillez utiliser la version 7-Zip conseillée jusqu'à \n"
"ce qu'un module d'interface plus récent soit disponible."

#: Merge.rc:1298
#, c-format
msgid "Version"
msgstr "Version"

#: Merge.rc:1300
#, c-format
msgid ""
"Plugin required\n"
"(dllbuild %04u)"
msgstr ""
"Module externe requis\n"
"(dllbuild %04u)"

#: Merge.rc:1302
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr "Version conseillée de 7-Zip:"

#: Merge.rc:1305
#: Merge.rc:1308
#, c-format
msgid "present"
msgstr "présent"

#: Merge.rc:1306
#, c-format
msgid "Merge7z000U.dll"
msgstr "Merge7z000U.dll"

#: Merge.rc:1309
#, c-format
msgid "7-Zip software installed on your computer:"
msgstr "Logiciel 7-Zip installé sur cet ordinateur:"

#: Merge.rc:1311
#: Merge.rc:1316
#, c-format
msgid "none"
msgstr "absent"

#: Merge.rc:1313
#, c-format
msgid "missing"
msgstr "absent"

#: Merge.rc:1314
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr "Composants 7-Zip pour opération autonome:"

#: Merge.rc:1318
#, c-format
msgid "outdated"
msgstr "périmé"

#: Merge.rc:1319
#, c-format
msgid "Plugins on path:"
msgstr "Modules externes à cet emplacement:"

#: Merge.rc:1320
#, c-format
msgid ""
"Don't display this &message again.\n"
"(You can always recall this message from the Help menu.)"
msgstr ""
"Ne plus afficher ce &message.\n"
"(Il peut toujours être réactivé dans le menu d'aide.)"

#: Merge.rc:1324
#, c-format
msgid "Plugin Download"
msgstr "Télécharger module"

#: Merge.rc:1333
#, c-format
msgid "Options"
msgstr "Options"

#: Merge.rc:1344
#, c-format
msgid " Categories"
msgstr " Catégories"

#: Merge.rc:1346
#, c-format
msgid "Import..."
msgstr "Importer..."

#: Merge.rc:1347
#, c-format
msgid "Export..."
msgstr "Exporter..."

#: Merge.rc:1355
#, c-format
msgid "Keywords:"
msgstr "Mots-clés:"

#: Merge.rc:1356
#, c-format
msgid "Function names:"
msgstr "Noms des fonctions:"

#: Merge.rc:1357
#, c-format
msgid "Comments:"
msgstr "Commentaires:"

#: Merge.rc:1358
#, c-format
msgid "Numbers:"
msgstr "Chiffres:"

#: Merge.rc:1359
#, c-format
msgid "Operators:"
msgstr "Opérateurs:"

#: Merge.rc:1360
#, c-format
msgid "Strings:"
msgstr "Chaines:"

#: Merge.rc:1361
#, c-format
msgid "Preprocessor:"
msgstr "Pré-processeur:"

#: Merge.rc:1362
#, c-format
msgid "User 1:"
msgstr "Utilisateur 1:"

#: Merge.rc:1363
#, c-format
msgid "User 2:"
msgstr "Utilisateur 2:"

#: Merge.rc:1368
#: Merge.rc:1373
#: Merge.rc:1378
#: Merge.rc:1383
#: Merge.rc:1388
#: Merge.rc:1393
#: Merge.rc:1398
#: Merge.rc:1403
#: Merge.rc:1408
#, c-format
msgid "Bold"
msgstr "Gras"

#: Merge.rc:1416
#, c-format
msgid "Folder Compare Report"
msgstr "Dossier du compte-rendu de comparaison"

#: Merge.rc:1419
#, c-format
msgid "Report &File:"
msgstr "Fichier de compte-rendu:"

#: Merge.rc:1422
#: Merge.rc:1596
#: Merge.rc:1600
#: Merge.rc:1627
#, c-format
msgid "Browse..."
msgstr "Parc&ourir..."

#: Merge.rc:1423
#, c-format
msgid "&Style:"
msgstr "&Style:"

#: Merge.rc:1426
#, c-format
msgid "&Copy to Clipboard"
msgstr "&Copier vers le presse-papiers"

#: Merge.rc:1434
#, c-format
msgid "Shared or Private Filter"
msgstr "Filtre partagé ou privé"

#: Merge.rc:1437
#, c-format
msgid "Which type of filter do you want to create?"
msgstr "Quel type de filtre voulez-vous créer ?"

#: Merge.rc:1439
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr "Filtre partagé (pour tous les utilisateurs de cet ordinateur)"

#: Merge.rc:1441
#, c-format
msgid "Private Filter (only for current user)"
msgstr "Filtre privé (pour l'utilisateur en cours uniquement)"

#: Merge.rc:1449
#: Merge.rc:1950
#, c-format
msgid "Archive Support"
msgstr "Support des archives"

#: Merge.rc:1452
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
msgstr "Le support des archives nécessite l'installation de 7-Zip:"

#: Merge.rc:1454
#, c-format
msgid "Download 7-zip Plugin"
msgstr "Télécharger 7-zip"

#: Merge.rc:1455
#, c-format
msgid "&Enable archive file support"
msgstr "&Activer le support des archives"

#: Merge.rc:1457
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr "&Utiliser le mode autonome de 7-Zip si disponible"

#: Merge.rc:1460
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr "U&tiliser la version localisée de 7-Zip depuis dossier de WinMerge"

#: Merge.rc:1462
#, c-format
msgid "&Detect archive type from file signature"
msgstr "&Détecter le type d'archives d'après le fichier de signature"

#: Merge.rc:1470
#, c-format
msgid "Compare Statistics"
msgstr "Statistiques de comparaison"

#: Merge.rc:1473
#, c-format
msgid "Folders:"
msgstr "Dossiers:"

#: Merge.rc:1474
#, c-format
msgid "Files:"
msgstr "Fichiers:"

#: Merge.rc:1475
#: Merge.rc:2341
#, c-format
msgid "Different"
msgstr "Différent"

#: Merge.rc:1476
#, c-format
msgid "Text:"
msgstr "Texte:"

#: Merge.rc:1479
#: Merge.rc:1498
#, c-format
msgid "Binary:"
msgstr "Binaire:"

#: Merge.rc:1482
#, c-format
msgid "Unique"
msgstr "Unique"

#: Merge.rc:1483
#, c-format
msgid "Left:"
msgstr "Gauche:"

#: Merge.rc:1488
#, c-format
msgid "Right:"
msgstr "Droite:"

#: Merge.rc:1493
#: Merge.rc:2335
#, c-format
msgid "Identical"
msgstr "Identique"

#: Merge.rc:1502
#, c-format
msgid "Total:"
msgstr "Total:"

#: Merge.rc:1507
#, c-format
msgid "Close"
msgstr "Fermer"

#: Merge.rc:1516
#, c-format
msgid "Affects"
msgstr "Concernés"

#: Merge.rc:1519
#: Merge.rc:1522
#, c-format
msgid "(Affects)"
msgstr "(Concernés)"

#: Merge.rc:1523
#, c-format
msgid "Select Codepage for"
msgstr "Sélectionner le encodage pour"

#: Merge.rc:1524
#, c-format
msgid "&File Loading:"
msgstr "&Chargement du fichier:"

#: Merge.rc:1526
#: Merge.rc:1529
#, c-format
msgid "..."
msgstr "..."

#: Merge.rc:1527
#, c-format
msgid "File &Saving:"
msgstr "&Enregistrement du fichier:"

#: Merge.rc:1530
#, c-format
msgid "&Use same codepage for both"
msgstr "&Utiliser la même encodage pour les deux"

#: Merge.rc:1533
#, c-format
msgid "&Apply"
msgstr "&Appliquer"

#: Merge.rc:1534
#: Merge.rc:1916
#, c-format
msgid "&Cancel"
msgstr "Ann&uler"

#: Merge.rc:1539
#, c-format
msgid "Test Filter"
msgstr "Tester le filtre"

#: Merge.rc:1542
#, c-format
msgid "Testing filter ..."
msgstr "Test du filtre..."

#: Merge.rc:1544
#, c-format
msgid "&Enter text to test:"
msgstr "&Saisir le texte à tester:"

#: Merge.rc:1546
#, c-format
msgid "&Folder Name"
msgstr "&Nom du dossier"

#: Merge.rc:1548
#, c-format
msgid "Result:"
msgstr "Resultat:"

#: Merge.rc:1552
#, c-format
msgid "&Test"
msgstr "&Tester"

#: Merge.rc:1553
#, c-format
msgid "&Close"
msgstr "&Fermer"

#: Merge.rc:1561
#, c-format
msgid "&Use customized text colors"
msgstr "&Utiliser les couleurs personnalisées"

#: Merge.rc:1564
#, c-format
msgid "Custom text colors"
msgstr "Couleurs personnalisées"

#: Merge.rc:1566
#, c-format
msgid "Whitespace:"
msgstr "Espace:"

#: Merge.rc:1567
#, c-format
msgid "Regular text:"
msgstr "Texte ordinaire:"

#: Merge.rc:1568
#, c-format
msgid "Selection:"
msgstr "Sélection:"

#: Merge.rc:1591
#, c-format
msgid "Paths"
msgstr "Emplacements"

#: Merge.rc:1597
#, c-format
msgid "R&ead-only"
msgstr "Lecture seule"

#: Merge.rc:1601
#, c-format
msgid "Re&ad-only"
msgstr "Lecture seule"

#: Merge.rc:1607
#, c-format
msgid "Open..."
msgstr "Ouvrir..."

#: Merge.rc:1608
#, c-format
msgid "Save..."
msgstr "Enregistrer..."

#: Merge.rc:1613
#: Merge.rc:1951
#, c-format
msgid "Backup Files"
msgstr "Fichiers de sauvegarde"

#: Merge.rc:1616
#, c-format
msgid "Create backup files in:"
msgstr "Créer des fichiers de sauvegarde pour:"

#: Merge.rc:1621
#, c-format
msgid "Create backup files into:"
msgstr "Créer les fichiers de sauvegarde dans:"

#: Merge.rc:1622
#, c-format
msgid "&Original file's folder"
msgstr "&Dossier du fichier original"

#: Merge.rc:1624
#, c-format
msgid "&Global backup folder:"
msgstr "Dossier de sauvegarde global:"

#: Merge.rc:1628
#, c-format
msgid "Backup filename:"
msgstr "&Nom de fichier pour les sauvergarde:"

#: Merge.rc:1629
#, c-format
msgid "&Append .bak -extension"
msgstr "Ajouter l'&extension .bak"

#: Merge.rc:1631
#, c-format
msgid "A&ppend timestamp"
msgstr "Ajouter la date et l'heure"

#: Merge.rc:1638
#: Merge.rc:2243
#, c-format
msgid "Confirm Copy"
msgstr "Confirmer la copie"

#: Merge.rc:1642
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr "Êtes-vous sûr de vouloir copier XXX éléments ?"

#: Merge.rc:1644
#, c-format
msgid "From left"
msgstr "De gauche"

#: Merge.rc:1647
#, c-format
msgid "To right"
msgstr "A droite"

#: Merge.rc:1650
#, c-format
msgid "Yes"
msgstr "Oui"

#: Merge.rc:1651
#, c-format
msgid "No"
msgstr "Non"

#: Merge.rc:1657
#, c-format
msgid "Plugins"
msgstr "Modules externes"

#: Merge.rc:1660
#, c-format
msgid "&Enable plugins"
msgstr "&Activer les plugiciels"

#: Merge.rc:1671
#: Merge.rc:1952
#, c-format
msgid "Shell Integration"
msgstr "Intégration à l'explorateur"

#: Merge.rc:1674
#, c-format
msgid "Explorer"
msgstr "Explorateur"

#: Merge.rc:1675
#, c-format
msgid "E&nable advanced menu"
msgstr "&Activer le menu avancé"

#: Merge.rc:1677
#, c-format
msgid "In&clude subfolders by default"
msgstr "In&clure les sous-dossiers par défaut"

#: Merge.rc:1679
#, c-format
msgid "&Add to context menu"
msgstr "&Ajouter au menu contextuel"

#: Merge.rc:1681
#, c-format
msgid "Folder compare"
msgstr "Comparaison de dossiers"

#: Merge.rc:1682
#, c-format
msgid "Add &Shell menu to context menu"
msgstr "Ajouter WinMerge au menu contextuel"

#. StringFileInfo.Block
#: Merge.rc:1708
#, c-format
msgid "040904e4"
msgstr "040c04e4"

#. VarFileInfo.Translation
#: Merge.rc:1724
#, c-format
msgid "0x409, 1252"
msgstr "0x40c, 1252"

#: Merge.rc:1739
#, c-format
msgid "Ready"
msgstr "Prêt"

#: Merge.rc:1745
#, c-format
msgid "EXT"
msgstr "EXT"

#: Merge.rc:1746
#, c-format
msgid "CAP"
msgstr "MAJ"

#: Merge.rc:1747
#, c-format
msgid "NUM"
msgstr "NUM"

#: Merge.rc:1748
#, c-format
msgid "SCRL"
msgstr "SCRL"

#: Merge.rc:1749
#, c-format
msgid "OVR"
msgstr "OVR"

#: Merge.rc:1750
#, c-format
msgid "REC"
msgstr "REC"

#: Merge.rc:1756
#, c-format
msgid ""
"Create empty documents\n"
"New Documents (Ctrl+N)"
msgstr ""
"Créer des documents vides\n"
"Nouveaux documents (Ctrl+N)"

#: Merge.rc:1757
#, c-format
msgid ""
"Open an existing document\n"
"Open (Ctrl+O)"
msgstr ""
"Ouvrir un document existant\n"
"Ouvrir  (Ctrl+O)"

#: Merge.rc:1758
#, c-format
msgid ""
"Close the active document\n"
"Close"
msgstr ""
"Ferme le document actif\n"
"Fermer"

#: Merge.rc:1759
#, c-format
msgid ""
"Save the active document\n"
"Save (Ctrl+S)"
msgstr ""
"Enregistre le document actif\n"
"Enregistrer  (Ctrl+S)"

#: Merge.rc:1760
#, c-format
msgid ""
"Save the active document with a new name\n"
"Save As"
msgstr ""
"Enregistre le document actif sous un nouveau nom\n"
"Enregistrer sous"

#: Merge.rc:1761
#, c-format
msgid ""
"Change the printing options\n"
"Page Setup"
msgstr ""
"Modifie les options d'impression\n"
"Mise en page"

#: Merge.rc:1762
#, c-format
msgid ""
"Change the printer and printing options\n"
"Print Setup"
msgstr ""
"Modifie l''imprimante et les options d'impression\n"
"Configuration de l'impression"

#: Merge.rc:1763
#, c-format
msgid ""
"Print the active document\n"
"Print"
msgstr ""
"Imprime le document actif\n"
"Imprimer"

#: Merge.rc:1764
#, c-format
msgid ""
"Display full pages\n"
"Print Preview"
msgstr ""
"Affiche les pages entières\n"
"Aperçu avant impression"

#: Merge.rc:1769
#, c-format
msgid "Make all hidden items visible again"
msgstr "Afficher tous les éléments cachés"

#: Merge.rc:1770
#, c-format
msgid "Toggle tree mode"
msgstr "Afficher/masquer l'arborescence"

#: Merge.rc:1771
#, c-format
msgid "Expand all subfolders"
msgstr "Développer tous les sous-dossiers"

#: Merge.rc:1772
#, c-format
msgid "Collapse all subfolders"
msgstr "Fermer tous les sous-dossiers"

#: Merge.rc:1778
#, c-format
msgid ""
"Open project file\n"
"Project file (Ctrl+J)"
msgstr ""
"Ouvrir un projet\n"
"Projet (Ctrl+J)"

#: Merge.rc:1779
#, c-format
msgid "Unknown error attempting to open project file"
msgstr "Erreur inconnue à l'ouverture du projet"

#: Merge.rc:1780
#, c-format
msgid "Unknown error attempting to save project file"
msgstr "Erreur inconnue à l'enregistrement du projet"

#: Merge.rc:1781
#, c-format
msgid "Project File"
msgstr "Projets"

#: Merge.rc:1782
#, c-format
msgid "Project file successfully loaded."
msgstr "Projet chargé avec succès."

#: Merge.rc:1783
#, c-format
msgid "Project file successfully saved."
msgstr "Projet enregistré avec succès."

#: Merge.rc:1784
#, c-format
msgid ""
"Save current paths and options to project file\n"
"Save Project File"
msgstr ""
"Enregistrer les emplacements et les options du projet\n"
"Enregistrer le projet"

#: Merge.rc:1789
#, c-format
msgid ""
"Display program information, version number and copyright\n"
"About"
msgstr ""
"Affiche des informations sur le programme, le numéro de version et le copyright\n"
"A propos de"

#: Merge.rc:1790
#, c-format
msgid ""
"Quit the application; prompts to save documents\n"
"Exit"
msgstr ""
"Quitte l'application et propose d'enregistrer les documents\n"
"Quitter"

#: Merge.rc:1796
#: Merge.rc:1797
#: Merge.rc:1798
#: Merge.rc:1799
#: Merge.rc:1800
#: Merge.rc:1801
#: Merge.rc:1802
#: Merge.rc:1803
#: Merge.rc:1804
#: Merge.rc:1805
#: Merge.rc:1806
#: Merge.rc:1807
#: Merge.rc:1808
#: Merge.rc:1809
#: Merge.rc:1810
#: Merge.rc:1811
#, c-format
msgid "Open this document"
msgstr "Ouvrir ce document"

#: Merge.rc:1816
#, c-format
msgid ""
"Switch to the next window pane\n"
"Next Pane"
msgstr ""
"Passe au volet suivant\n"
"Volet suivant"

#: Merge.rc:1817
#, c-format
msgid ""
"Switch back to the previous window pane\n"
"Previous Pane"
msgstr ""
"Revient au volet précédent\n"
"Volet précédent"

#: Merge.rc:1823
#, c-format
msgid ""
"Arrange windows so they overlap\n"
"Cascade Windows"
msgstr ""
"Réorganise les fenêtres en cascade\n"
"Cascade"

#: Merge.rc:1824
#, c-format
msgid ""
"Arrange windows as non-overlapping tiles horizontally\n"
"Tile Windows Horizontally"
msgstr ""
"Réorganise les fenêtres en une mosaïque horizontale\n"
"Mosaïque horizontale"

#: Merge.rc:1825
#, c-format
msgid ""
"Arrange windows as non-overlapping tiles vertically\n"
"Tile Windows Vertically"
msgstr ""
"Réorganise les fenêtres en une mosaïque verticale\n"
"Mosaïque verticale"

#: Merge.rc:1831
#, c-format
msgid ""
"Copy the selection and put it on the Clipboard\n"
"Copy"
msgstr ""
"Copie la sélection dans le presse-papiers\n"
"Copier"

#: Merge.rc:1832
#, c-format
msgid ""
"Cut the selection and put it on the Clipboard\n"
"Cut"
msgstr ""
"Supprime la sélection et la copie dans le presse-papiers\n"
"Copier"

#: Merge.rc:1833
#, c-format
msgid ""
"Find the specified text\n"
"Find"
msgstr ""
"Recherche le texte spécifié\n"
"Rechercher"

#: Merge.rc:1834
#, c-format
msgid ""
"Insert Clipboard contents\n"
"Paste"
msgstr ""
"Insère le contenu du presse-papiers\n"
"Coller"

#: Merge.rc:1835
#, c-format
msgid ""
"Repeat the last action\n"
"Repeat"
msgstr ""
"Répète la dernière action\n"
"Répéter"

#: Merge.rc:1836
#, c-format
msgid ""
"Replace specific text with different text\n"
"Replace"
msgstr ""
"Remplace un texte spécifique par un texte différent\n"
"Remplacer"

#: Merge.rc:1837
#, c-format
msgid ""
"Select the entire document\n"
"Select All"
msgstr ""
"Sélectionne le document entier\n"
"Sélectionner tout"

#: Merge.rc:1838
#, c-format
msgid ""
"Undo the last action\n"
"Undo (Ctrl+Z)"
msgstr ""
"Annule la dernière action\n"
"Annuler"

#: Merge.rc:1839
#, c-format
msgid ""
"Redo the previously undone action\n"
"Redo (Ctrl+Y)"
msgstr ""
"Rétablit l'action précédemment annulée\n"
"Rétablir"

#: Merge.rc:1845
#, c-format
msgid ""
"Show or hide the toolbar\n"
"Toggle ToolBar"
msgstr ""
"Affiche ou masque la barre d'outils\n"
"Barre d'outils"

#: Merge.rc:1846
#, c-format
msgid ""
"Show or hide the status bar\n"
"Toggle StatusBar"
msgstr ""
"Affiche ou masque la barre d'état\n"
"Barre d'état"

#: Merge.rc:1847
#, c-format
msgid ""
"Show or hide the tab bar\n"
"Toggle TabBar"
msgstr ""
"Affiche ou masque la barre des onglets\n"
"Barre d'onglet"

#: Merge.rc:1848
#, c-format
msgid ""
"Automatically resize panes\n"
"Lock Panes"
msgstr ""
"Redimensionne automatiquement les fenêtres\n"
"Verrouille les fenêtres"

#: Merge.rc:1854
#, c-format
msgid "Change the window size"
msgstr "Modifie la taille de la fenêtre"

#: Merge.rc:1855
#, c-format
msgid "Change the window position"
msgstr "Modifie la position de la fenêtre"

#: Merge.rc:1856
#, c-format
msgid "Reduce the window to an icon"
msgstr "Réduit la fenêtre en icône"

#: Merge.rc:1857
#, c-format
msgid "Enlarge the window to full size"
msgstr "Agrandit la fenêtre au format de l'écran"

#: Merge.rc:1858
#, c-format
msgid "Switch to the next document window"
msgstr "Passe à la fenêtre du document suivant"

#: Merge.rc:1859
#, c-format
msgid "Switch to the previous document window"
msgstr "Passe à la fenêtre du document précédent"

#: Merge.rc:1860
#, c-format
msgid "Close the active window and prompts to save the documents"
msgstr "Ferme la fenêtre active et propose l'enregistrement des documents"

#: Merge.rc:1865
#, c-format
msgid "Restore the window to normal size"
msgstr "Restaure la fenêtre à sa taille d'origine"

#: Merge.rc:1866
#, c-format
msgid "Activate Task List"
msgstr "Active la liste des tâches"

#: Merge.rc:1867
#, c-format
msgid "Activate this window"
msgstr "Active cette fenêtre"

#: Merge.rc:1873
#, c-format
msgid ""
"Close print preview mode\n"
"Cancel Preview"
msgstr ""
"Ferme le mode d'aperçu avant impression\n"
"Annule l'aperçu"

#: Merge.rc:1880
#, c-format
msgid ""
"\n"
"FileCompare\n"
"\n"
"\n"
"\n"
"WinMerge.FileCompare\n"
"WinMerge File Compare"
msgstr ""
"\n"
"FileCompare\n"
"\n"
"\n"
"\n"
"WinMerge.FileCompare\n"
"WinMerge File Compare"

#: Merge.rc:1881
#, c-format
msgid ""
"\n"
"FolderCompare\n"
"\n"
"\n"
"\n"
"WinMerge.FolderCompare\n"
"WinMerge Folder Compare"
msgstr ""
"\n"
"FolderCompare\n"
"\n"
"\n"
"\n"
"WinMerge.FolderCompare\n"
"WinMerge Folder Compare"

#: Merge.rc:1888
#, c-format
msgid "Preserve original EOL chars"
msgstr "Conserver les caractères de fin de ligne [EOL] originaux"

#: Merge.rc:1895
#, c-format
msgid "Press any key"
msgstr "Appuyer sur n'importe quelle touche"

#: Merge.rc:1901
#: Merge.rc:1902
#, c-format
msgid "Right click on the path to copy"
msgstr "Clic droit sur le chemin pour le copier"

#: Merge.rc:1908
#, c-format
msgid ""
"Developers:\n"
"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
msgstr ""
"Développeurs:\n"
"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"

#: Merge.rc:1909
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
msgstr "WinMerge est fourni SANS AUCUNE GARANTIE. C'est un logiciel libre et vous êtes invité à le redistribuer sous certaines conditions; Voir la licence publique générale GNU au menu d'aide pour tous les détails."

#: Merge.rc:1915
#, c-format
msgid "&Ok"
msgstr "&OK"

#: Merge.rc:1917
#, c-format
msgid "&Abort"
msgstr "&Abandonner"

#: Merge.rc:1918
#, c-format
msgid "&Retry"
msgstr "&Réessayer"

#: Merge.rc:1919
#, c-format
msgid "&Ignore"
msgstr "&Ignorer"

#: Merge.rc:1920
#, c-format
msgid "Ignore &all"
msgstr "Ignorer tout"

#: Merge.rc:1921
#, c-format
msgid "&Yes"
msgstr "&Oui"

#: Merge.rc:1927
#, c-format
msgid "Yes to &all"
msgstr "Oui pour &tous"

#: Merge.rc:1928
#, c-format
msgid "&No"
msgstr "&Non"

#: Merge.rc:1929
#, c-format
msgid "No to a&ll"
msgstr "Non pour t&ous"

#: Merge.rc:1930
#, c-format
msgid "&Continue"
msgstr "&Continuer"

#: Merge.rc:1931
#, c-format
msgid "&Skip"
msgstr "&Ignorer"

#: Merge.rc:1932
#, c-format
msgid "Skip &all"
msgstr "Ignorer tout"

#: Merge.rc:1934
#, c-format
msgid "Don't display this &message again."
msgstr "Ne plus afficher ce &message."

#: Merge.rc:1935
#, c-format
msgid "Don't ask this &question again."
msgstr "Ne plus poser cette &question."

#: Merge.rc:1945
#, c-format
msgid "Syntax colors"
msgstr "Couleurs de la syntaxe"

#: Merge.rc:1946
#, c-format
msgid "Text Colors"
msgstr "Couleurs du texte"

#: Merge.rc:1948
#, c-format
msgid "Version Control"
msgstr "Contrôle de version"

#: Merge.rc:1959
#, c-format
msgid "To:"
msgstr "Vers:"

#: Merge.rc:1960
#, c-format
msgid "From left:"
msgstr "De gauche:"

#: Merge.rc:1961
#, c-format
msgid "To left:"
msgstr "A gauche:"

#: Merge.rc:1962
#, c-format
msgid "From right:"
msgstr "De droite:"

#: Merge.rc:1963
#, c-format
msgid "To right:"
msgstr "A droite:"

#: Merge.rc:1969
#, c-format
msgid "Version %1"
msgstr "Version %1"

#: Merge.rc:1970
#, c-format
msgid "Unicode"
msgstr "Unicode"

#: Merge.rc:1971
#, c-format
msgid "X64"
msgstr "X64"

#: Merge.rc:1977
#, c-format
msgid "Options (%1)"
msgstr "Options (%1)"

#: Merge.rc:1978
#, c-format
msgid "All message boxes are now displayed again."
msgstr "Tous les messages d'information seront affichés à nouveau."

#: Merge.rc:1979
#, c-format
msgid "Modifications have been made to the current file comparison session.  Some settings may not take place until the current file comparison is restarted."
msgstr "Des modifications ont été apportées à la session de comparaison du fichier actif. Certaines options de configuration ne seront prises en compte qu'après le redémarrage de la comparaison du fichier actif."

#: Merge.rc:1980
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
msgstr "Le changement de police ne sera appliqué à aucune fenêtre de comparaison active."

#: Merge.rc:1982
#, c-format
msgid ""
"Value in Tab size -field is not in range WinMerge accepts.\n"
"\n"
"Please use values 1 - %1."
msgstr ""
"La valeur de la taille des tabulations dépasse la fourchette de valeurs acceptées par WinMerge.\n"
"\n"
"Veuillez utiliser des valeurs de 1 à %1."

#: Merge.rc:1984
#, c-format
msgid ""
"Are you sure you want to reset all WinMerge options to default values?\n"
"\n"
"Please re-start WinMerge after the reset."
msgstr ""
"Etes-vous sûr de vouloir rétablir toutes les options par défaut de WinMerge?\n"
"\n"
"Veuillez redémarrer WinMerge après la réinitialisation."

#: Merge.rc:1990
#, c-format
msgid "Open"
msgstr "Ouvrir"

#: Merge.rc:1991
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Programmes|*.exe;*.bat;*.cmd|Tous les fichiers (*.*)|*.*||"

#: Merge.rc:1992
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr "Tous les fichiers (*.*)|*.*||"

#: Merge.rc:1993
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "Fichiers de projet WinMerge (*.WinMerge)|*.WinMerge||"

#: Merge.rc:1995
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Fichiers d'options (*.ini)|*.ini|Tous les fichiers (*.*)|*.*||"

#: Merge.rc:2001
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Fichiers texte (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Tous les fichiers (*.*)|*.*||"

#: Merge.rc:2002
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "Fichiers HTML (*.htm,*.html)|*.htm;*.html|Tous les fichiers(*.*)|*.*||"

#: Merge.rc:2003
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "Fichiers XML (*.xml)|*.xml|All Files (*.*)|*.*||"

#: Merge.rc:2009
#, c-format
msgid "UTF-8"
msgstr "UTF-8"

#: Merge.rc:2010
#, c-format
msgid "UTF-8 (B)"
msgstr "UTF-8 (B)"

#: Merge.rc:2011
#, c-format
msgid "UCS-2 LE"
msgstr "UCS-2 LE"

#: Merge.rc:2012
#, c-format
msgid "UCS-2 BE"
msgstr "UCS-2 BE"

#: Merge.rc:2018
#, c-format
msgid "Full Contents"
msgstr "Contenu complet"

#: Merge.rc:2019
#, c-format
msgid "Quick Contents"
msgstr "Contenu rapide"

#: Merge.rc:2020
#, c-format
msgid "Modified Date"
msgstr "Date de modification"

#: Merge.rc:2021
#, c-format
msgid "Modified Date and Size"
msgstr "Date de modification et taille"

#: Merge.rc:2022
#, c-format
msgid "Size"
msgstr "Taille"

#: Merge.rc:2028
#: Merge.rc:2653
#, c-format
msgid "Name"
msgstr "Nom"

#: Merge.rc:2029
#, c-format
msgid "Location"
msgstr "Emplacement"

#: Merge.rc:2030
#, c-format
msgid "Filters"
msgstr "Filtres"

#: Merge.rc:2031
#, c-format
msgid "[F] "
msgstr "[F] "

#: Merge.rc:2032
#: Merge.rc:2655
#, c-format
msgid "Description"
msgstr "Description"

#: Merge.rc:2033
#, c-format
msgid "Select filename for new filter"
msgstr "Sélectionner un nom de fichier pour le nouveau filtre"

#: Merge.rc:2034
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Filtres de fichier (*.flt)|*.flt|Tou...
 
[truncated message content]

[Winmerge-support] Updated Ukrainian translation

[Warrior <wa...@ra...>]

Hello! I updated Ukrainian translation, corrected errors, inaccuracies
sufferet by me before, changed the names of some functions 2 more clear
for man who know Ukrainian. All update to v2.12.4

Warrior

[Winmerge-support] About translation to pt-br

[Felipe <fel...@ig...>]

hi, i translated to pt-br using the latest english file but winmerge
cant open my translation, it says unresolved or unmatched differences
detected but poedit compiles my file normally without any problem,
attached is the translated file.

[Winmerge-support] Tree view, expanded by default

[Dean E. <de...@ea...>]

Hi all.

I like the treeview in WinMerge, but can there be an option to have it
fully expanded initially?

I know I can view/expand all or switch to normal mode to see the overview,
but I'm lazy :)

-- 
Dee Earley (de...@ea...)

irc:    irc://irc.blitzed.org/
web:    http://www.earlsoft.co.uk
phone:  +44 (0)780 8369596

[Winmerge-support] Moved Block Detection not working properly

[Markus W. <mw...@bi...>]

I'm currently refactoring code I didn't write myself. One of the tasks 
is to extract new methods from very loooong methods.

The problem is that WinMerge doesn't recognize the large blocks of code 
I moved into new methods. Any way to tune this behavior?

And yes, I'm using the current version of WinMerge.

BTW, the standard diff viewer of SourceSafe 2005 doesn't have this 
problem. ;-)

TIA,

Markus Winhard