Merge

ArchiveSupport/Merge7z/SignMerge7z.bat

@@ -1,6 +1,6 @@
-@echo off
-
-call "%SIGNBAT_PATH%" "..\..\Build\MergeUnicodeRelease\Merge7z\Merge7z*.dll"
-call "%SIGNBAT_PATH%" "..\..\Build\x64\MergeUnicodeRelease\Merge7z\Merge7z*.dll"
-
-pause
+@echo off
+
+call "%SIGNBAT_PATH%" "..\..\Build\MergeUnicodeRelease\Merge7z\Merge7z*.dll"
+call "%SIGNBAT_PATH%" "..\..\Build\x64\MergeUnicodeRelease\Merge7z\Merge7z*.dll"
+
+pause

Docs/Developers/Old-Changelogs/Testing-CppUnit.txt

@@ -1,51 +1,51 @@
-Testing\selftest\Changes.txt
-
-2007-05-14 Gal
- Fixed test case for bug 1639453.
- Added test case for bug 1714088.
-  StringDifferencing: DiffColoring.cpp DiffColoring.h
-
-2007-03-26 Gal
- Fix and addition to line coloring tests
-  StringDifferencing: DiffColoring.cpp DiffColoring.h
-
-2007-03-21 Gal
- Fix TestCase1::Difference2 test.
-  StringDifferencing: TestCase1.cpp
-
- Add more test case to stringdiff (line coloring feature).
-  StringDifferencing: StringDifferencing.dsp
-  StringDifferencing new files: DiffColoring.cpp DiffColoring.h
-
-2006-11-22 Kimmo
- Add more case difference tests to stringdiffs
-  StringDifferencing: StringDifferencing.dsp
-  StringDifferencing new files: CasesDiffByte.cpp CasesDiffByte.h
-
-2006-11-21 Kimmo
- Fix string differencing cases, add few new cases
-  StringDifferencing: DifferentStrings1.cpp DifferentStrings1.h StringDifferencing.cpp
-   TestCase1.cpp
-
-2006-11-20 Kimmo
- Add unit tests for projectfiles
-  Add folder: CppUnit/ProjectFile and its contents
- Few fixes to the tests (need to create the project file for every test)
-  CppUnit/ProjectFile: LeftAndRight.cpp LeftAndRightNonRecursive.cpp LeftAndRightRecursive.cpp
-   PathsAndFilter.cpp ProjectFile.dsp ProjectFileTesting.cpp SimpleLeft.cpp SimpleRight.cpp
-   StdAfx.h
-  CppUnit/ProjectFile/TestData: LeftAndRightNonRecursive.WinMerge
-   LeftAndRightRecursive.WinMerge
-
-2006-10-31 Kimmo
- Cleanup example test, add more simple string compare tests
-  StringDifferencing: StringDifferencing.dsp TestCase1.cpp TestCase1.h
-  StringDifferencing: add files DifferentStrings1.cpp DifferentStrings1.h
-   IdenticalStrings1.cpp IdenticalStrings1.h
-
-2006-10-27 Kimmo
- PATCH: [ 1585418 ] CppUnit tests for StringDiff
-  Add folder Testing/CppUnit for unit tests
-  Add folder CppUnit/StringDifferencing and its contents
-
-
+Testing\selftest\Changes.txt
+
+2007-05-14 Gal
+ Fixed test case for bug 1639453.
+ Added test case for bug 1714088.
+  StringDifferencing: DiffColoring.cpp DiffColoring.h
+
+2007-03-26 Gal
+ Fix and addition to line coloring tests
+  StringDifferencing: DiffColoring.cpp DiffColoring.h
+
+2007-03-21 Gal
+ Fix TestCase1::Difference2 test.
+  StringDifferencing: TestCase1.cpp
+
+ Add more test case to stringdiff (line coloring feature).
+  StringDifferencing: StringDifferencing.dsp
+  StringDifferencing new files: DiffColoring.cpp DiffColoring.h
+
+2006-11-22 Kimmo
+ Add more case difference tests to stringdiffs
+  StringDifferencing: StringDifferencing.dsp
+  StringDifferencing new files: CasesDiffByte.cpp CasesDiffByte.h
+
+2006-11-21 Kimmo
+ Fix string differencing cases, add few new cases
+  StringDifferencing: DifferentStrings1.cpp DifferentStrings1.h StringDifferencing.cpp
+   TestCase1.cpp
+
+2006-11-20 Kimmo
+ Add unit tests for projectfiles
+  Add folder: CppUnit/ProjectFile and its contents
+ Few fixes to the tests (need to create the project file for every test)
+  CppUnit/ProjectFile: LeftAndRight.cpp LeftAndRightNonRecursive.cpp LeftAndRightRecursive.cpp
+   PathsAndFilter.cpp ProjectFile.dsp ProjectFileTesting.cpp SimpleLeft.cpp SimpleRight.cpp
+   StdAfx.h
+  CppUnit/ProjectFile/TestData: LeftAndRightNonRecursive.WinMerge
+   LeftAndRightRecursive.WinMerge
+
+2006-10-31 Kimmo
+ Cleanup example test, add more simple string compare tests
+  StringDifferencing: StringDifferencing.dsp TestCase1.cpp TestCase1.h
+  StringDifferencing: add files DifferentStrings1.cpp DifferentStrings1.h
+   IdenticalStrings1.cpp IdenticalStrings1.h
+
+2006-10-27 Kimmo
+ PATCH: [ 1585418 ] CppUnit tests for StringDiff
+  Add folder Testing/CppUnit for unit tests
+  Add folder CppUnit/StringDifferencing and its contents
+
+

Filters/Frontpage.flt

@@ -1,35 +1,35 @@
-## This is a directory/file filter for WinMerge
-name: Frontpage
-desc: Suppresses _vti and other system directories in Frontpage websites
-
-## This is an inclusive (loose) filter
-## (it lets through everything not specified)
-def: include
-
-## Filters for filenames begin with f:
-## Filters for directories begin with d:
-## (Inline comments begin with " ##" and extend to the end of the line)
-
-d: \\fpdb$
-d: \\stats$
-d: \\_borders$
-d: \\_derived$
-d: \\_fpclass$
-d: \\_overlay$
-d: \\_private$
-d: \\_contentindex$
-d: \\_themes$
-d: \\_vti_bin$
-d: \\_vti_cnf$
-d: \\_vti_log$
-d: \\_vti_map$
-d: \\_vti_pvt$
-d: \\_vti_txt$
-d: \\_vti_script$
-d: \\_vti*$
-d: \\\.svn$ ## Subversion working copy
-d: \\_svn$  ## Subversion working copy ASP.NET Hack
-d: \\cvs$   ## CVS control directory
-d: \\\.git$ ## Git directory
-d: \\\.bzr$ ## Bazaar branch
-d: \\\.hg$ ## Mercurial repository
+## This is a directory/file filter for WinMerge
+name: Frontpage
+desc: Suppresses _vti and other system directories in Frontpage websites
+
+## This is an inclusive (loose) filter
+## (it lets through everything not specified)
+def: include
+
+## Filters for filenames begin with f:
+## Filters for directories begin with d:
+## (Inline comments begin with " ##" and extend to the end of the line)
+
+d: \\fpdb$
+d: \\stats$
+d: \\_borders$
+d: \\_derived$
+d: \\_fpclass$
+d: \\_overlay$
+d: \\_private$
+d: \\_contentindex$
+d: \\_themes$
+d: \\_vti_bin$
+d: \\_vti_cnf$
+d: \\_vti_log$
+d: \\_vti_map$
+d: \\_vti_pvt$
+d: \\_vti_txt$
+d: \\_vti_script$
+d: \\_vti*$
+d: \\\.svn$ ## Subversion working copy
+d: \\_svn$  ## Subversion working copy ASP.NET Hack
+d: \\cvs$   ## CVS control directory
+d: \\\.git$ ## Git directory
+d: \\\.bzr$ ## Bazaar branch
+d: \\\.hg$ ## Mercurial repository

Plugins/SignPlugins.bat

@@ -1,6 +1,6 @@
-@echo off
-
-call "%SIGNBAT_PATH%" dlls\*.dll
-call "%SIGNBAT_PATH%" dlls\x64\*.dll
-call "%SIGNBAT_PATH%" WinMerge32BitPluginProxy\Release\*.exe
-pause
+@echo off
+
+call "%SIGNBAT_PATH%" dlls\*.dll
+call "%SIGNBAT_PATH%" dlls\x64\*.dll
+call "%SIGNBAT_PATH%" WinMerge32BitPluginProxy\Release\*.exe
+pause

ShellExtension/SignShellExtension.bat

@@ -1,6 +1,6 @@
-@echo off
-
-call "%SIGNBAT_PATH%" "..\Build\ShellExtensionUnicode Release MinDependency\ShellExtensionU.dll"
-call "%SIGNBAT_PATH%" "..\Build\x64\ShellExtensionUnicode Release MinDependency\ShellExtensionX64.dll"
-
-pause
+@echo off
+
+call "%SIGNBAT_PATH%" "..\Build\ShellExtensionUnicode Release MinDependency\ShellExtensionU.dll"
+call "%SIGNBAT_PATH%" "..\Build\x64\ShellExtensionUnicode Release MinDependency\ShellExtensionX64.dll"
+
+pause

Translations/Docs/Readme/ReadMe-Turkish.txt

@@ -1,36 +1,36 @@
-WINMERGE
-
-WinMerge Windows i�in A��k Kaynakl� bir kar��la�t�rma ve bire�tirme arac�d�r. WinMerge klas�rleri ve dosyalar� kar��la�t�rabilir, farklar� g�rsel metin bi�iminde, kolayca anla��l�p i�lenebilecek �ekilde sunar. WinMerge d�� bir fark/birle�tirme arac� olarak kullan�labilece�i gibi ayr� bir uygulama olarak da kullan�labilir.
-
-WinMerge kar��la�t�rma, e�le�tirme ve birle�tirme i�lemlerini olabildi�ince kolay ve kullan��l� �ekilde yapabilmek i�in pek �ok �zelli�e sahiptir. �e�itli programlama dilleri ve baz� dosya tiplerini tan�yarak buna g�re yaz�m vurgulamas� yapabilir.
-
-En son program s�r�m� ve gerekli bilgilere http://winmerge.org/ adresinden ula�abilirsiniz.
-
-H�zl� Ba�lang��
-===============
-WinMerge program�n� kurduktan sonra temel i�lemleri nas�l yapabilece�inizi ��renmek i�in yard�m>WinMerge Yard�m� se�ene�ine t�klay�n ve h�zl� ba�lang�� (quick start) ba�l���na gidin. Ayn� bilginin Web s�r�m�ne http://winmerge.org/docs/manual/QuickStart.html adresinden ula�abilirsiniz.
-
-WinMerge Yard�m�
-================
-WinMerge Yard�m�, kurulum s�ras�nda yerel olarak kopyalanm�� bir Microsoft HTML yard�m dosyas�d�r (WinMerge.chm). Yard�m almak i�in, Yard�m>WinMerge Yard�m� se�ene�ine t�klay�n veya WinMerge ekran�ndayken F1 tu�una bas�n. Komut sat�r�ndan ise WinMerge program�n� 
-/? yard�m anahtar� ile �al��t�r�n.
-
-WinMerge yard�m�n�n webdeki html s�r�m�ne http://winmerge.org/docs/manual/ adresinden ula�abilirsiniz.
-
-S�k��t�r�lm�� Dosya Deste�i
-===========================
-WinMerge, s�k��t�r�lm�� dosya deste�i i�in 7-Zip (http://www.7-zip.org) A��k Kaynak s�k��t�rma arac�n� kullan�r. 7-Zip uygulamas�n� kullanmak i�in http://winmerge.org/downloads/ adresinden bulabilece�iniz 7-Zip eklenti kurucusunu indirerek kurman�z� �neririz.
-
-Herhangi bir nedenle 7-Zip arac�n� kuramazsan�z, yaln�zca s�k��t�r�lm�� dosya deste�i i�in gereken eklenti kurucusunu kullanabilirsiniz. Ayr�nt�lar i�in yard�m konular�ndaki "7-Zip ve s�k��t�r�lm�� dosya deste�i" konusuna bak�n.
-
-WinMerge Deste�i
-================
-WinMerge hakk�nda sorular�n�z ve �nerileriniz mi var? Bunun i�in http://forums.winmerge.org/ adresinden ula�abilece�iniz WinMerge toplulu�u forumunu kullanabilirsiniz. Yaz�l�m geli�tiriciler forumlardaki sorular� s�kl�kla okuyup yan�tlamaktad�rlar. Kullan�m gibi genel WinMerge konular� i�in A��k Tart��ma (Open Discussion) forumunu, yaz�l�m geli�tirme ile ilgili konular i�in de Geli�tirici (Developers) forumunu kullanabilirsiniz.
-
-Hatalar ve gelecekteki istekler
-===============================
-E�er WinMerge forumlar�nda ��z�lmemi� bir hata ile kar��la��rsan�z, http://project.winmerge.org/ adresine giderek proje izleyicileri denetleyin. �zleyiciler men�s�nden hatalar (bugs) veya gelecekteki istekler (feature requests) gibi bir ba�lant�ya t�klayarak ba�l�klara g�z at�p yeni bir ba�l�k a�abilirsiniz.
-
-Bir hata bildiriyorsan�z, WinMerge s�r�m�n� de belirtin. Yard�m>Yap�land�rma se�ene�ine t�klayarak bir yap�land�rma g�nl��� olu�turabilirsiniz. Bu g�nl��� hata raporunuza ekleyin. Bu g�nl�k geli�tiriciler i�in pek �ok yararl� bilgiyi i�erir.
-
-- WinMerge Geli�tiricileri
+WINMERGE
+
+WinMerge Windows i�in A��k Kaynakl� bir kar��la�t�rma ve bire�tirme arac�d�r. WinMerge klas�rleri ve dosyalar� kar��la�t�rabilir, farklar� g�rsel metin bi�iminde, kolayca anla��l�p i�lenebilecek �ekilde sunar. WinMerge d�� bir fark/birle�tirme arac� olarak kullan�labilece�i gibi ayr� bir uygulama olarak da kullan�labilir.
+
+WinMerge kar��la�t�rma, e�le�tirme ve birle�tirme i�lemlerini olabildi�ince kolay ve kullan��l� �ekilde yapabilmek i�in pek �ok �zelli�e sahiptir. �e�itli programlama dilleri ve baz� dosya tiplerini tan�yarak buna g�re yaz�m vurgulamas� yapabilir.
+
+En son program s�r�m� ve gerekli bilgilere http://winmerge.org/ adresinden ula�abilirsiniz.
+
+H�zl� Ba�lang��
+===============
+WinMerge program�n� kurduktan sonra temel i�lemleri nas�l yapabilece�inizi ��renmek i�in yard�m>WinMerge Yard�m� se�ene�ine t�klay�n ve h�zl� ba�lang�� (quick start) ba�l���na gidin. Ayn� bilginin Web s�r�m�ne http://winmerge.org/docs/manual/QuickStart.html adresinden ula�abilirsiniz.
+
+WinMerge Yard�m�
+================
+WinMerge Yard�m�, kurulum s�ras�nda yerel olarak kopyalanm�� bir Microsoft HTML yard�m dosyas�d�r (WinMerge.chm). Yard�m almak i�in, Yard�m>WinMerge Yard�m� se�ene�ine t�klay�n veya WinMerge ekran�ndayken F1 tu�una bas�n. Komut sat�r�ndan ise WinMerge program�n� 
+/? yard�m anahtar� ile �al��t�r�n.
+
+WinMerge yard�m�n�n webdeki html s�r�m�ne http://winmerge.org/docs/manual/ adresinden ula�abilirsiniz.
+
+S�k��t�r�lm�� Dosya Deste�i
+===========================
+WinMerge, s�k��t�r�lm�� dosya deste�i i�in 7-Zip (http://www.7-zip.org) A��k Kaynak s�k��t�rma arac�n� kullan�r. 7-Zip uygulamas�n� kullanmak i�in http://winmerge.org/downloads/ adresinden bulabilece�iniz 7-Zip eklenti kurucusunu indirerek kurman�z� �neririz.
+
+Herhangi bir nedenle 7-Zip arac�n� kuramazsan�z, yaln�zca s�k��t�r�lm�� dosya deste�i i�in gereken eklenti kurucusunu kullanabilirsiniz. Ayr�nt�lar i�in yard�m konular�ndaki "7-Zip ve s�k��t�r�lm�� dosya deste�i" konusuna bak�n.
+
+WinMerge Deste�i
+================
+WinMerge hakk�nda sorular�n�z ve �nerileriniz mi var? Bunun i�in http://forums.winmerge.org/ adresinden ula�abilece�iniz WinMerge toplulu�u forumunu kullanabilirsiniz. Yaz�l�m geli�tiriciler forumlardaki sorular� s�kl�kla okuyup yan�tlamaktad�rlar. Kullan�m gibi genel WinMerge konular� i�in A��k Tart��ma (Open Discussion) forumunu, yaz�l�m geli�tirme ile ilgili konular i�in de Geli�tirici (Developers) forumunu kullanabilirsiniz.
+
+Hatalar ve gelecekteki istekler
+===============================
+E�er WinMerge forumlar�nda ��z�lmemi� bir hata ile kar��la��rsan�z, http://project.winmerge.org/ adresine giderek proje izleyicileri denetleyin. �zleyiciler men�s�nden hatalar (bugs) veya gelecekteki istekler (feature requests) gibi bir ba�lant�ya t�klayarak ba�l�klara g�z at�p yeni bir ba�l�k a�abilirsiniz.
+
+Bir hata bildiriyorsan�z, WinMerge s�r�m�n� de belirtin. Yard�m>Yap�land�rma se�ene�ine t�klayarak bir yap�land�rma g�nl��� olu�turabilirsiniz. Bu g�nl��� hata raporunuza ekleyin. Bu g�nl�k geli�tiriciler i�in pek �ok yararl� bilgiyi i�erir.
+
+- WinMerge Geli�tiricileri

Translations/InnoSetup/Portuguese.isl

@@ -350,12 +350,12 @@ TurkishLanguage=Turkish menus and dialogs
 UkrainianLanguage=Ukrainian menus and dialogs
 
 ;Tasks
-ExplorerContextMenu=&Enable Explorer context menu integration
+ExplorerContextMenu=&Permitir o menu de contexto no Explorador
 IntegrateTortoiseCVS=Integrate with &TortoiseCVS
 IntegrateTortoiseGIT=Integrate with To&rtoiseGIT
 IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
 IntegrateClearCase=Integrate with Rational &ClearCase
-AddToPath=&Add WinMerge folder to your system path
+AddToPath=&Criar pasta do WinMerge no caminho do sistema
 
 ; 3-way merge wizard page
 ThreeWayMergeWizardPageCaption=3-Way Merge

Translations/WinMerge/BuildMergeLangDll.bat

@@ -1,9 +1,9 @@
-cd
-echo %0
-echo $(IntDir) = %1
-echo $(TargetPath) = %2
-cd Languages
-cscript CreateMasterPotFile.vbs
-cd ..
-rc /fo%1\MergeLang.res /i.. Languages\MergeLang.rc
-link /DLL /NOENTRY /MACHINE:IX86 /OUT:%2\..\MergeLang.dll %1\MergeLang.res
+cd
+echo %0
+echo $(IntDir) = %1
+echo $(TargetPath) = %2
+cd Languages
+cscript CreateMasterPotFile.vbs
+cd ..
+rc /fo%1\MergeLang.res /i.. Languages\MergeLang.rc
+link /DLL /NOENTRY /MACHINE:IX86 /OUT:%2\..\MergeLang.dll %1\MergeLang.res

Translations/WinMerge/Portuguese.po

@@ -378,7 +378,7 @@ msgstr "&Configura
 #: Merge.rc:175DEEEB
 #, c-format
 msgid "&GNU General Public License"
-msgstr "GNU Licença Pública Geral"
+msgstr "Licença Pública Geral GNU"
 
 #: Merge.rc:3938FFC3
 #, c-format
@@ -1849,7 +1849,7 @@ msgstr "Abrir em editor externo"
 #: Merge.rc:28D5CCAA
 #, c-format
 msgid "Display Columns"
-msgstr "Mostrar colunas"
+msgstr "Mostrar Colunas"
 
 #: Merge.rc:4856953D
 #, c-format
@@ -2839,7 +2839,7 @@ msgstr "Programadores:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, T
 #: Merge.rc:3EF068BF
 #, 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 não tem GARANTIA. Este é um software livre e pode ser redistribuído sobre determinadas circunstâncias; Consulte a Licença Pública Geral GNU ou vá ao Menu Ajuda para mais informações."
+msgstr "O WinMerge não tem GARANTIA. Este é um software livre e pode ser redistribuído sobre determinadas circunstâncias; Consulte a Licença Pública Geral GNU ou vá ao Menu Ajuda para mais informações."
 
 #: Merge.rc:1D2E49FF
 #, c-format