romfast/foxbin2prg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Programa para permitir comparar binarios directamente, usando la herramienta Diff predeterminada o que se configure

Browse Source
This commit is contained in:
fdbozzo
2015-07-28 01:23:07 +02:00
parent a2d15babd5
commit 054f2917ae
230 changed files with 228279 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

779
WinMergePortable/App/WinMerge/Docs/ChangeLog.txt Normal file
View File

@@ -0,0 +1,779 @@
This file summarizes changes in WinMerge releases.
Numbers in parentheses refer to SourceForge.net tracker item numbers
old format (#XXXXXXX) or new format (patches:#XXXX) or
to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL:
http://winmerge.org/tracker/[tracker-id]
WinMerge 2.14.0 - 2013-02-02 (r7596)
Bugfix: Shell extension uses unquoted program path (patches:#3023)
Translation updates:
- Dutch (patches:#3020)
- Slovenian (patches:#3021)
WinMerge 2.13.22 - 2013-01-13 (r7585)
Translation updates:
- Turkish (patches:#2967)
- Russian (patches:#3017)
- Norwegian (patches:#3018)
- Danish (patches:#3019)
WinMerge 2.13.21 - 2012-12-30 (r7575)
Update PCRE to version 8.10
Update SCEW to version 1.1.2
Improve startup time (#2788142)
Add menuitems for selecting automatic or manual prediffing (#2638608)
Add accelerator keys for Shell context menu (#2823536)
Improve editing of linefilter regular expressions (#3015416)
Allow editing context line count in patch creator (#2092180)
Improve color options organization (#2818451)
Add /xq command line switch for closing WinMerge after identical files
and not showing message (#2827836)
Allow setting codepage from command line (#2725549)
Allow giving encoding name as custom codepage (#2813825, #3010934)
Add new options dialog panel for folder compare options (#2819626)
Add options GUI for quick compare limit (#2825628)
Write config log as UTF-8 file (r7057)
Bugfix: Untranslated string ("Merge.rc:nnnn") was displayed
in status bar (#3025855)
Bugfix: Pane headers not updated after language change (#2923684)
Bugfix: Quick contents compare didn't ignore EOL byte differences (#2929005)
Bugfix: Compare by size always checked file times too (#2919510)
Bugfix: Crash when pasting from clipboard (#3109525)
Bugfix: Keeps verifing path even turned off in options (#3111581)
Bugfix: Crash after deleting text (#3109521)
Bugfix: Added EOL chars between copied file/path names (#2817546)
Bugfix: Created new matching folder to wrong folder (#2890961)
Bugfix: Strange scrolling effect in location pane (#2942869)
Bugfix: Plugin error after interrupting folder compare (#2919475)
Bugfix: "+" and "-" from the number block don't work in the editor (#3306182)
Bugfix: Date format did not respect Regional Settings (#3175189)
Bugfix: When selecting multiple files in Patch Generator dialog,
"Swap" button led to an error. (#3043635, #3066200)
Bugfix: WinMerge contained a vulnerability in handling project files (#3185386)
(http://www.zeroscience.mk/mk/vulnerabilities/ZSL-2011-4997.php)
Installer: Remove OpenCandy from the InnoSetup installer (r7572, r7539)
New translation: Basque (#3387142)
Translation updates:
- French (#3412030)
- Hungarian (#3164982)
- Spanish (#3412937)
WinMerge 2.13.20 - 2010-10-20 (r7319)
Add missing keywords to Pascal highlighter (#2834192)
Recognize .ascx files as ASP files (#3042393)
Fix help locations (#2988974)
Show only "Copy to other side" item in file compare
context menu (#2600787)
Expand/collapse folders from keyboard (#2203904)
Improve detecting XML files in file compare (#2726531)
Initialize folder selection dialog to currently selected folder in
options dialog (r6570)
New translation: Persian (#2877121, #3065119)
New translation: Serbian (#3017674, #3065119)
Installer: Drop Windows 9x/ME/NT4 support and use Microsoft runtime
libraries installer (#3070254)
Installer: Remove Uninstall shortcut from start menu folder (#3076909)
Installer: Don't install quick launch icon for Windows 7 (#3079966)
Installer: Add OpenCandy to the InnoSetup installer (#3088720)
Bugfix: WinMerge was vulnerable to DLL hijacking as described in
Microsoft Security Advisory (2269637) (#33056008)
Bugfix: Location pane focus enabled "Save" (#3022292)
Bugfix: "Copy and advance" toolbar icons not automatically enabled (#3033325)
Translation updates:
- Bulgarian (#3082392)
- Chinese (#3033324)
- Dutch (#2804979)
- French (#2850842, #2968200)
- Slovenian (#2917796, #2932094, #2934354, #3070136)
- Spanish (#2930734)
- Turkish (#2825132, #2827817)
- Ukrainian (#2817835)
WinMerge 2.12.4 - 2009-06-09 (r6833)
Add more C/C++ types to syntax highlight (#2776705)
Create config log file to My Documents-folder (#2789839)
Bugfix: Reports had same left/right descriptions (#2772646)
Bugfix: When conflict file saved trailing line-ending was lost (#2550412)
Bugfix: File compare HTML reports use invald DOCTYPE (#2783477)
Bugfix: "##" in file filter pattern caused an infinite loop (#2789345)
Bugfix: Could select prediffer when plugins were disabled (#2787131)
Bugfix: Opening mixed-EOL file one side forced both files to be handled as
mixed-eol files (#2022312)
Bugfix: Didn't show correct EOL chars if whitespace chars were turned off
and again on (#2791402)
Bugfix: Generated patch had wrong file time for UTF-16 files (#2791506)
Bugfix: Did not export changed options values (#2799149)
Bugfix: Reset the compare method to original if it was changed (#2802427)
WinMerge 2.12.2 - 2009-04-01 (r6625)
Disable folder compare tree-view by default (#2714968)
Bugfix: Filename extension column was empty for files (#2670046)
Bugfix: Crash when selecting backup folder (#2686382)
bugfix: Swapping panes did not update statusbar (#2661838)
Bugfix: Says files are identical after making files different in another
application and re-loading them (#2672737)
Bugfix: Files with missing last EOL weren't merged correctly (#2712120)
Translation updates:
- Polish (#2717382, #2720875)
WinMerge 2.12.0 - 2009-03-05 (r6542)
Remember last target folder for Copy/Move to in folder compare (#2659228)
Detect Windows 7 and Windows 2008 in config log (#2599256)
Bugfix: Help window opened from WinMerge was modal (#2590079)
Bugfix: Crash in editor when undoing (#2590212)
Bugfix: Browse button in Option dialog reverted to previous settings
(#2606153)
Bugfix: Files without extension get backed up to name..bak (#2627752)
Bugfix: Must Show Different to Show L/R Unique (#2129561)
Translation updates:
- Chinese Traditional (#2608190)
- Croatian (#2596949)
- Czech (r6538)
- Danish (#2648183)
- Dutch (#2586422, #2590430)
- French (#2603591)
- Galician (#2632173)
- German (#2586497)
- Greek (#2615285)
- Japanese (r6456)
- Swedish (#2586274)
- Ukrainian (#2609242)
WinMerge 2.11.2 - 2009-02-05 (r6428)
Update Python syntax highlight keywords for Python 2.6 (#2473375)
More accurate visible area rect in location pane (#2479804)
New options page for Shell Integration options (#2433648)
Remove Frhed hex editor from GUI (context menu) (r6376)
Register.bat should use Find with full path (#2536582)
Better Unicode file detection for full contents compare (2477657)
Bugfix: Could not open project file that contains an ampersand
character in folder names (#2372000)
Bugfix: File compare method "Modified Date and Size" ignored file size
(#2455595)
BugFix: Quick compare didn't ignore EOL differences (#2433677)
Bugfix: Remove EOL characters from command line (#2458728)
Bugfix: Merging one line diff to empty other side didn't work (#2456399)
Bugfix: Location pane was empty for some files with diffs (#2459234)
Bugfix: Line filter editing didn't update edit box when editing was
canceled by ESC key (#2493935)
Bugfix: Wrong number shown for difference when using line filters (#2493980)
Bugfix: Crashed if compared file disappeared during file compare (#2493945)
Bugfix: Creating new files caused message about missing files (#2515875)
Bugfix: Could not hide folders in recursive compare (#2528749)
Bugfix: Folder Compare:Copy Right/Left don't create folder
Bugfix: Must Show Different to Show L/R Unique (#2129561)
Bugfix: Could not copy files from right to left (#2556904)
Bugfix: Don't show file name extension for folders (#2563314)
Translation updates:
- Brazilian (#2461443, #2524796)
- Chinese Traditional (#2540115)
- Czech (r6201)
- Dutch (#2481022, #2494378, #2499994)
- French (#2551043, #2551066)
- Greek (#2550911)
- Swedish (#2452467, #2465385, #2511043)
WinMerge 2.12.x (R2_12) branch created (r6202)
WinMerge 2.11.1.8 - 2008-12-19 (r6200)
Allow reloading the file if it has been changed on the disk
behind WinMerge (#2354125)
Add option to show Open-dialog on WinMerge startup (#2327424)
Add Git to Source Control filter and fix ignore file rules (#2329381)
Add build identifier for 64-bit builds to About-dialog (r6142)
Installer: Option to add WinMerge to system path (#2435175)
Add Unicode version of heksedit (#2036603)
Allow multiple file compare documents by default (#2445749)
Bugfix: Move confirmation dialog sometimes had wrong paths (#2327565, #2309190)
Bugfix: Use translated version of readme.txt for Chinese Simplified (#2391000)
Bugfix: Installer didn't install readme.txt for all translations (#2396437)
Bugfix: Could not give paths to commandline when started WinMerge
from Cygwin prompt (#2427946)
Bugfix: Infinite loop in heksedit's Replace-dialog (r6176)
Translation updates:
- Croatian (#2390558)
- German (r6130)
- Greek (#2379356)
- Japanese (r6154)
- Swedish (#2318778, #2374278)
WinMerge 2.11.1.7 - 2008-11-20 (r6112)
Add shell context menu to folder compare context menu (#2189315)
Update PCRE to version 7.8 (#2209911)
Show missing lines in location pane for diffs having both different
and missing lines (#2119235)
Syntax highlighting for Verilog files (#2231145)
Tweak new "equal file" icon a little bit (#2312381)
Readme update (#2234689)
Translation updates:
- Brazilian (#2219568)
- Czech (r6034)
- Swedish (#2215167, #2236651)
WinMerge 2.11.1.6 - 2008-10-23 (r6033)
General compare status for files (not known if text/binary) (#2175736)
Change icons for the new general compare status (#2185302)
Use 24bit icons for "Bookmarks" and "Delete" menu items (#2141184)
Installer: create backup of ClearCase config file (#2129095)
BugFix: Translatable strings having space before colon (#1971868)
BugFix: Wrong cursor position when disabling selection margin (#2138555)
BugFix: Showed a black line when disabling selection margin (#2068790)
BugFix: Fix manual URL in Readme.txt (#2181628)
BugFix: Long unique paths were mixed up in folder compare view (#2129634)
BugFix: Some calls made to plugins when plugins were disabled (#2182788)
BugFix: If messagebox was shown during file loading location pane
didn't show any differences (#2101780)
WinMerge 2.11.1.5 - 2008-10-02 (r5995)
Use external editor to edit file filters (#2082774)
Improved command line handling (#2081779)
Change Manual url to http://winmerge.org/docs/manual/ (r5956)
Manual updates
Plugins: Show processing instructions in XML plugin (#1979321)
Add icon for "Compare" menu item (#2119843)
Change download URL to current URL (#2136765)
Installer: create backup of ClearCase config file (#2129095)
BugFix: ClearCase checkout/commit dialog translation error (#2051069)
BugFix: Table of Contents in manual (#2071625)
BugFix: Highlight ShowUnInstDetails keyword for NSIS files (#2084879)
BugFix: Displayed a blank time when file last modified time is 00:00:00
(#2098626)
BugFix: Customized colors weren't used in some areas (#2110218)
BugFix: Zip files were extracted into wrong folder (#2110350)
BugFix: Case-sensitive regexp search didn't work (#1991259)
BugFix: There were some installer regressions
(eg. Installer didn't create Quick Launch icon) (#1460517)
BugFix: Whitespace ignore options didn't work with quick compare (#2120174)
BugFix: Giving path to file and folder to command line
did not work (#2138560)
New translation: Galician (#2120685)
Translation updates:
- German (r5934)
- Russian (#2067785)
- Swedish (#2075513)
- Ukrainian (#2131753)
WinMerge 2.11.1.4 - 2008-08-21 (r5846)
Binary file edit/compare (#2036603)
Add wait cursor for undo and redo (#2039228)
Add icon for "Open Conflict File" menu item (#2047054)
Include unique subfolder contents in recursive folder compare (#2034259)
Installer: Use -u switch in TortoiseSVN command line (#2060782)
Add icon for "Plugins->List" menu item (#2060771)
BugFix: External editor command line switches did not work (#2037862)
BugFix: Deleting/Moving file crashed WinMerge in debugger (#2025833)
Bugfix: Lost focus after folder compare operations (#2046002)
Bugfix: Some files had folder icons when aborting folder compare (#2018836)
BugFix: Didn't select word-diff cyclically by pressing F4 key (#1989858)
BugFix: Could not reset EOL ignore after selecting it from query
dialog (#2056741)
Translation updates:
- Brazilian (#2059836)
- German (#2045666)
- Greek (#2062442)
- Chinese Traditional (#2039929)
- Japanese (r5805)
- Swedish (#2062107)
WinMerge 2.11.1.3 - 2008-08-04 (r5733)
Rename color scheme menu item "None" and add separator (#2027300)
Add -u commandline parameter as alternative to -ub (#2029275, #2030359)
Remove RCLocalizationHelper plugin (#2029457)
Clarify Supercopier caused hang in release notes (#2030040)
Improve tree mode in folder compare (#2018836)
Unlimited undo (#2033754)
BugFix: Could change syntax highlight mode when highlighting was
disabled from options (#2027325)
BugFix: Editing line filters updated wrong filter (#2025130)
BugFix: Boldfacing did work only for Courier font (#2000996)
BugFix: Shift+Backspace didn't work in editor (#1153696)
WinMerge 2.11.1.2 - 2008-07-24 (r5673)
Refresh compare after changing filter (#2017426)
Add dialog listing available plugins (#2021722)
Hierarchical directory comparison result view (#2018836)
Add "Open Conflict" for file/folder compare menus (#2025472)
Enable hierarchial folder compare view by default (#2025478)
Confirmation dialog for move operations (#2026508)
Manual: New build system (#2015434)
Manual: Improve Opening Files and Folders (#2017901)
Manual: Improve folder compare documentation (#2024587)
BugFix: Failed to compare UTF-8 files plugins disabled (#2018287)
Bugfix: Don't warn about closing multiple windows when only one
window is open (#2010463)
BugFix: Moving was allowed for protected items (#2023734)
BugFix: Could change EOL style for protected file (#2025781)
WinMerge 2.11.1.1 - 2008-07-11 (r5609)
Manual: Introduction update (#2011365)
Manual: Reorganize structure (#2011924)
Add ShellExtension menu for drive letters (root folders) (#2011602)
Remove buildall.bat (#2013576)
New option to enable plugins (disabled by default) (#2013845)
Plugins: Show processing instructions in XML plugin (#1979321)
BugFix: Use system codepage for paths (#1979429, #2008581)
BugFix: ANSI build crash in folder compare (#2010053)
BugFix: Add insert/overtype mode indicator to statusbar (#2015174)
BugFix: Detected UTF-8 encoding shown as 65001 (#2012377)
WinMerge 2.10.x (R2_10) branch created (r5561)
WinMerge 2.9.1.5 - 2008-07-04 (r5560)
Manual: Copy editing (#2000322, #2005418)
Manual: Clarify 64-bit support (#2002431)
Reduce executable sizes (#2003203)
Release Notes update (#2007673, r5557)
BugFix: Possible crash when enabling line filter (#2004160)
BugFix: Location Pane flickers when scrolling (#1938177, #2005031)
BugFix: Use system codepage for paths (#1979429, #2008581)
BugFix: Random crashes in folder compare (#2005308)
Translation updates:
- Chinese Traditional (#2007426)
WinMerge 2.9.1.4 - 2008-06-24 (r5518)
Use PCRE regular expressions in the editor (#1991259)
Installer: install to all users (#1460517)
Update release notes (#1990886, #1995265, #1999880)
Manual: Use PNG files (#1988845, #1989744)
BugFix: Temp paths in Reports created from archive file (#1984346)
BugFix: ISL file syntax highlighting starts comment with { (#1981326)
BugFix: Crash when starting a second instance (#1993835)
BugFix: Crash when starting WinMerge with only one path (#1994402)
BugFix: Messages missing from installer translations (r5506)
BugFix: Always right side as origin side in copy confirmation dialog
when Copy To... (#2001237)
New translation: Slovenian (#1997236)
Translation updates:
- Brazilian (#1994578)
- Swedish (#2000307)
WinMerge 2.9.1.3 - 2008-06-05 (r5438)
Update PCRE (regular expression library) to version 7.7 (#1941779)
Add VB.net keywords to Basic highlighter (#1970912)
Open conflict files by drag & dropping to main window (#1984884)
Possible improvement for WinMerge exit bug (#1602313)
BugFix: Location Pane flickers when resizing (#1740106)
BugFix: Command line description text starting with "/" confused
WinMerge (#1973225)
BugFix: Item count in statusbar not get cleared (#1976480)
New translation: Ukrainian (#1973149, #1974021)
Translation updates:
- Brazilian (#1978374)
- Korean (#1978362)
- Swedish (#1980970)
WinMerge 2.9.1.2 - 2008-05-23 (r5362)
Optimize location pane (r5341, r5342, r5346, r5351, r5355, r5356)
BugFix: Version Control filter did not match all VSS files (#1881186)
BugFix: Fix showing differences in the end of the line (#1883409, #1962816)
BugFix: Fix command line paths in quotes ending with "\" (#1963523)
New translation: Greek (#1968429)
Translation updates:
- Bulgarian (#1957434)
- Croatian (#1958283)
- Swedish (#1950188, #1970074)
WinMerge 2.9.1.1 - 2008-04-23 (r5324)
Release Notes update (#1933950)
Installer: Use correct way to create start menu web link (#1913919)
Installer: Simplify DeletePreviousStartMenu() function (#1913949)
Installer: Updated the side art of the installer application (#1915012)
Update URLs and switch to 2.8 manual (#1919965)
New splash screen (#1914869)
Tab icons at Filter dialog (#1926531)
Add VS2003/VS2005 project files (#1926346)
Create separate document for compiling WinMerge (#1927502)
Update InnoSetup translations (#1931492)
Make 'Yes' the default button in copy confirmation dialog (#1943647)
Allow drag & drop of paths to Open dialog (#1945254)
Enlarge 'Discard All' button in Save confirmation dialog (#1947216)
BugFix: Installer could create a registry access error (#1909967)
BugFix: The filter text box in Open-dialog sometimes displayed some garbage
data (#1915424)
BugFix: Print area was not clipped correctly. (#1915536)
BugFix: Undo after pane swapping (#1915536, #1923625)
BugFix: Quick compare for same folder didn't show differences (#1918599)
BugFix: Installer didn't have ChangeLog.txt included (r5255)
BugFix: Shortcuts given in command line were not expanded (#1942217)
New translation: Romanian (#1939729)
Translation updates:
- Brazilian (#1913723)
- Chinese Traditional (#1927605)
- French (#1920380)
- German (r5130, r5139, r5171, r5203, r5236, #1949068)
- Italian (#1939235)
- Japanese (r5152)
- Polish (#1934655)
- Russian (#1914466)
- Spanish (#1907152, r5250)
- Swedish (#1908289)
WinMerge 2.8 RC - 2008-03-04 (r5125)
Update developers list in splash screen (#1891548)
Better error handling for Excel plugin (#1510293)
Add macros, bookmarks and document properties to Word plugin (#1510298)
Add *.dot (document template) extension to Word plugin (r5120)
BugFix: Copy&Paste from VB6 added binary chars (#1904355)
Translation updates:
- Chinese Traditional (#1905323)
- Swedish (#1905520)
WinMerge 2.7.7.6 - 2008-02-28 (r5099)
Remove sintance.h/sintance.cpp as not compatible with GPL (#1886580)
Automatically switch to mixed-EOL mode when loading files with
two or more EOL styles (#1901547)
Indent "Explorer Context Menu" sub options (#1901763)
Replace 'DOS' in EOL style strings with 'Windows' (#1902583)
Show 'Mixed' as file compare EOL style instead of empty style (r5091)
Typo fixes and grammar improvements to several strings (#1898401)
BugFix: Ignore codepage specified on File Encoding dialog if file was
detected as UTF-8 (#1900728)
BugFix: Recognize invalid UTF-8 sequence as UTF-8 (#1900733)
BugFix: Didn't highlight any difference between untitled documents (#1900257)
Translation updates:
- Czech (r5073)
- Japanese (r5076)
- Swedish (#1901784)
WinMerge 2.7.7.5 - 2008-02-22 (r5069)
Cleaning up Help-menu (#1875111)
Right-align tab size number in editor options (r5037)
Move Time difference ignore -option to compare options (#1892283)
Add option to select temporary folder (#1893167)
Show file encoding in file compare statusbar (#1895629)
Unify EOL style strings in folder compare and file compare (#1896462)
Remove "DisplayBinaryFiles" and "EditBinaryFiles" plugin (#1899161)
BugFix: Potential lockup in folder compare (#1865131, #1889907)
BugFix: Line filter didn't filter non-ascii lines correctly (#1880628)
BugFix: GNU General Public License name in menu (#1868989)
BugFix: Didn't switch back to content compare once switched to quick
compare in folder compare (#1770373)
BugFix: Quick compare didn't ignore EOL differences (#1884717)
Translation updates:
- Croatian (r5032)
- Czech (r5017)
- German (r5038)
- Slovak (#1895583)
- Swedish (#1891326)
WinMerge 2.7.7.4 - 2008-02-07 (r5011)
Detect (and read/write) UTF-8 files without BOM (#1879271)
Tell user that file is not a conflict file (#1880423)
Allow opening conflict file from command line (#1880857)
Use radio symbol for current EOL menu item (#1869755)
Ask and create pair for unique folder and open them (#1881454)
Add publisher info to version resource (#1884920)
Move "Zoom In/Out" to own sub menu (#1879340)
Installer: Add more version resource info (#1885793)
Reset text zoom to default size with Ctrl + * (#1886664)
BugFix: Always return 0 to command line (#1854419)
BugFix: Merge/Delete deleted items from read-only sides (#1882019)
BugFix: Shellextension had no publisher info and wrong
description (#1878828)
BugFix: Lockup when showing binary files (#1880711)
Translation updates:
- Croatian (r4952)
- Japanese (r4962)
- Swedish (#1884918)
WinMerge 2.7.7.3 - 2008-01-23 (r4951)
Resolve conflict files (cvs, svn...) (#1875129)
Save line filter when edit box loses focus (#1875853)
Add link to translations website at help menu (#1699883)
Manual: Add instructions for conflict file resolving (#1876770)
Manual: Document third path given to command line (#1877735)
BugFix: Fix Quick Compare regression in 2.7.7.2 (#1872165)
Bugfix: Clipped text in file saving error message (#1874854)
WinMerge 2.7.7.2 - 2008-01-14 (r4915)
Syntax highlighting for PowerShell files (#1859657)
Syntax highlighting for PO(T) files (#1866221)
Change font size with Ctrl + MouseWheel (#1865795, #1869686)
Horizontal scrolling with Shift + MouseWheel (#1865795)
Installer: Add support for integration with latest version of TortoiseCVS and
TortoiseSVN x64 (#1865168)
Close compare tab with middle mouse button (#1865220)
Add index.html for documentation folders (#1866183)
Manual: Clarify file filters folder name matching (#1867212)
Improve file compare margin icons location (#1718699)
Enable file compare to open binary files (#1869647)
File encoding dialog for file compare (#1871079)
BugFix: Crash when using TrackPoint middle-button scrolling (#1864040)
BugFix: WinMerge didn't show the contents of the symbolic link target (#1864978)
BugFix: Unused registry key HKCU\Thingamahoochie\WinMerge was created
(#1865202)
BugFix: Register.bat didn't work on Windows 98 and Vista (#1869821)
BugFix: Open-dialog was not displayed on Windows 98 (#1866442, #1869858)
BugFix: Right mouse button didn't move cursor to new place (#1814184)
Translation updates:
- Spanish (#1867234)
- Swedish (#1867765, #1867844)
WinMerge 2.7.7.1 - 2007-12-20 (r4842)
New option to keep file's time when saving in file compare (#1851921)
Installer: Link to translated ReadMe in Start menu, if file exists (#1805818)
Add HTML-formatted release notes (#1851308, #1852534)
Installer: Install release notes file (#1852599)
Installer: Move manual to core files component and remove
User Guide component (#1853409)
Bugfix: VS2008 and VS2005 compile problems (#1847265)
Bugfix: More difference highlight code reverts (#1748940)
Translation updates:
- Spanish (#1655577)
WinMerge 2.7.6 - 2007-11-29 (r4807)
Touchpad scrolling improvements (#1837457)
BugFix: Values with "," inside could break the CSV report (#1831512)
BugFix: Failed to create backup file in folder compare (#1835283)
BugFix: Revert difference highlight code to 2.6.12 version (#1811695)
BugFix: Backspace key didn't work when renaming items (#1738790)
Translation updates:
- Croatian (r4786)
WinMerge 2.7.5.7 - 2007-11-19 (r4772)
Remove MFC dependency from ShellExtension (#1833521)
Update ShellExtension icon to new WinMerge icon (#1833616)
BugFix: Build script didn't update PO files correctly before copying (r4756)
BugFix: ShellExtension's icon was clipped if system font size was small
(#1833616)
BugFix: Merge controls were not enabled for missing lines (#1833714)
WinMerge 2.7.5.6 - 2007-11-15 (r4752)
BugFix: Many translation-system related fixes and improvements (#1804762)
BugFix: When copying files to VCS system, destination file was
not checked out (#1828930)
BugFix: Visible area indicator on location pane shook when clicking
above or below the vertical scroll bar to scroll one screen (#1829572)
Translation updates:
- Croatian (#1829301)
- Japanese (r4730)
WinMerge 2.7.5.5 - 2007-11-08 (r4722)
Bugfix: Don't enable merge GUI for ignored differences (#1826375)
BugFix: PgUp key caused the error message "An invalid argument was
encountered" when word-wrap mode was on (#1820631)
BugFix: Keep selected items visible in Folder Compare columns dialog (r4715)
BugFix: Disable Folder Compare column selection dialog's up/down buttons
when first/last items are selected (r4716)
BugFix: Many translation-system related fixes and improvements (#1804762)
Add Croatian translation (#1820308)
Translation updates:
- Chinese Traditional (#1824691)
WinMerge 2.7.5.4 - 2007-11-01 (r4687)
New PO files based translation system (#1804762)
New folder compare column selection dialog (#1804555)
Install WinMerge.exe (ANSI version) only for Windows 95/98/ME (#1809140)
Better multi-monitor support, with option to lock panes (#1788168)
Installer: Install PO files and MergeLang.dll (#1820689)
BugFix: Ignored differences were merged when merging multiple
differences (#1811745)
Bugfix: Don't clear selection when right-clicking outside it (#1814184)
Bugfix: Configuration log labeled Vista as Longhorn (#1815859)
Bugfix: Customized text color for ignored differences didn't shown (#1807895)
Translation updates:
- Chinese Traditional (#1810192, #1810541)
- Italian (#1805044)
WinMerge 2.7.5.3 - 2007-09-27 (r4572)
Use PO files for translations (generate RC-files from PO-files)
Add Portuguese translation (#1756364)
Change Up/Down button names in folder compare columns dialog(#1800064)
BugFix: Fix MakeResDll crash (#1795421)
BugFix: Full screen mode didn't work with multiple monitors (#1788168)
Bugfix: Revert multiple monitor patches (#1788168)
BugFix: PgUp key didn't do anything in beginning of the file (#1795680)
BugFix: The option 'Automatically scroll to first difference' didn't work
properly when word-wrap mode was on (#1795814)
Translation updates:
- French (#1800064, #1802363)
- Japanese (r4546)
WinMerge 2.7.5.2 - 2007-09-11 (r4528)
Graphical improvements to location pane (#1770175)
Remove MFC dependency from resource compiler (#1783581)
Better multi-monitor support (split file view on monitor boundary) (#1788168)
BugFix: Renaming unique item (only other side) renamed parent folder (#1787816)
BugFix: Goto didn't change the active pane when selecting another pane (#1791351)
Translation updates:
- Traditional Chinese (r4473)
WinMerge 2.7.5.1 - 2007-08-16 (r4440)
HTML reports for file compare (#1739209)
Ask confirmation when exiting with multiple windows open (#1757800)
Translation updates:
- Catalan (r4370)
- Simplified Chinese (r4369)
- Danish (r4360)
- French (r4383)
- Russian (r4421)
- Slovak (r4413)
- Swedish (r4412)
WinMerge 2.7.4 - 2007-06-27 (r4352)
Batch-file syntax highlighting keywords cleanup (#1743504)
Bugfix: Archivesupport: Zip-->both didn't work correctly (#1734439)
Bugfix: Linediff didn't highlight whitespace differences (#1698781)
Bugfix: Copy confirmation dialog did show wrong To-path (#1740024)
Translation updates:
- Italian (#1737491)
WinMerge 2.7.3.7 - 2007-06-14 (r4330)
New big toolbar (actual image instead of placeholder) (#1736520)
Bugfix: Fixes to folder compare copy/rename operations (#1730534)
Translation updates:
- Swedish (#1735635)
WinMerge 2.7.3.6 - 2007-06-07 (r4321)
Recent project files in File-menu (#1731551)
Automatically import existing linefilters to new dialog (#1718040)
Bugfix: copy/delete of unique items failed in folder compare
in 2.7.3.5 (#1730534)
Bugfix: crashed when ESC was pressed while renaming item in
folder compare (#1705874)
WinMerge 2.7.3.5 - 2007-05-31 (r4304)
Relax selecting parent folder restrictions (up arrow in folder compare) (#1727829)
Show a warning if item can't be found anymore in folder compare
and it is tried to access (copy/move/delete) (#1723778)
New Borland Delphi file filter (#1699783)
Gradient toolbar (#1717774)
Bugfix: could not create new file filters in 2.7.3.4 (#1719892)
WinMerge 2.7.3.4 - 2007-05-15 (r4287)
Big (32x32) toolbar (image still placeholder) (#1698641)
Improve folder compare copy confirmation dialog (#1699585, #1700241)
New file filter for Symbian developers (#1694048)
Bugfix: several fixes to in-line difference highlight (#1694102, #1714088)
Bugfix: word wrap lose horizontal scrollbar (#1706476)
Bugfix: fixes to tabbed window control (#1718148)
Translation updates:
- German (#1701151)
- Japanese
- Korean (#1704904)
- Swedish (#1703350)
WinMerge 2.7.3.3 - 2007-04-04 (r4234)
Tabbed interface (#1603292)
Enable shell integration for folder backgrounds (#1693113)
Allow selecting syntax highlighting (#1690346)
New C# development file filter (#1689854)
Icon updates (#1686279, #1692097)
Bugfix: compare by date and by size broken in 2.7.3.2 (#1693441)
Bugfix: Open-dialog file filter failed if modified (#1693275)
Translation updates:
- Swedish (#1689515)
WinMerge 2.7.3.2 - 2007-03-27 (r4201)
Several fixes to line difference highlighting (#1491334, #1683061, #1639453)
Icon updates (#1684865)
Printing improvement (#1687430)
Language files size reduced (#1687661, #1687983, #1688012)
Bugfix: 2.7.3.1 binary file compare crash (#1687966)
Bugfix: long linefilters now restored correctly (#1680920)
Translation updates:
- Japanese
WinMerge 2.7.3.1 - 2007-03-20 (r4179)
New copy confirmation dialog in folder compare (#1675087, #1683842)
Improved line filter dialog (#1682475)
Installer/uninstaller icons restored to default icons
Some icon updates (#1680209)
Bugfix: folder compare lost focus after confirmation dialog (#1670991)
Bugfix: crash comparing empty folders (#1675211)
Translation updates:
- Czech
- French (#1664689)
- Polish (#1673082)
- Swedish (#1673908, #1678676, #1683289)
WinMerge 2.7.2 - 2007-02-27 (r4137)
Fix ShellExtension installation bug
Translation updates:
- Czech
- German (#1667564)
- French (#1664689)
WinMerge 2.7.1.7 - 2007-02-20 (r4120)
Folder compare threading improvement - should be faster in many
situations (#1662002)
New options for backup file location and naming (#1652696)
Syntax highlighting for CSS files (#1582537)
Allow to hide folder compare margins (View/View Margins) (#1663798)
Translation updates:
- Czech
- Polish (#1650831)
- Swedish (#1657664)
WinMerge 2.7.1.6 - 2007-02-01 (r4094)
New post-compare line filters for folder compare (#1644820)
Optimization for word wrap code (#1640741)
Bugfix: 2.7.1.5 forgets selected filter (#1637433)
Bugfix: limiting to single file compare window now works more
logically (#1636314)
Bugfix: ANSI regular expressions didn't work (#1644668)
Translation updates:
- Bulgarian (#1639493)
- Catalan (#1646638)
- Swedish (#1634968)
WinMerge 2.7.1.5 - 2007-01-10 (r4030)
New line filter implementation (please test and report bugs!) (#1593810)
Minimum height for location pane's visible area (#1489875)
Short label "Error" for error items in folder compare (#1567749)
Bugfix: rename edits wrong field in folder compare (#1597939)
Bugfix: too much scrolling in difference navigation
Bugfix: wrong text selection after pane switch in file compare (#1630630)
Bugfix: crash when editing space-char indented files (#1631613)
Manual updates
WinMerge 2.7.1.4 - 2006-12-21 (r3991)
Match lines inside differences (#1447744)
Workaround-patch (locally included to the build) for
shutdown problems (#1602313)
New ASP.Net filefilter (#1619689)
Bugfix: folder compare speed regression in 2.7.1.3 (#1610442)
Bugfix: new fix for folder compare Copy Left/Right To.. (#1603061)
Bugfix: copyright info missing from about dialog when
translation selected (#1604115)
Bugfix: location pane problems with word-wrap (#1584068, #1611542)
Bugfix: invalid path added to project file -dialog (#1602219)
Swedish translation update (#1614442)
Manual updates
WinMerge 2.7.1.3 - 2006-12-05 (r3919)
Now hides skipped items by default (#1604078)
Improved INI file syntax highlighting (#1607193)
Easier folder selection in Project File -dialog (#1603196)
New "Exclude Source Control files and directories filter" filefilter (#1557295)
Bugfix: project files weren't loaded correctly from command line
(using shell file association) (#1602214)
Bugfix: crash in syntax parser (#1556688)
Bugfix: wrong difference navigation when word-wrap enabled (#1597814)
Bugfix: ClearCase integration didn't install if "Program Files" -folder
was named differently (non-English Windows)
Manual updates
Slovak translation update (#1606496)
WinMerge 2.7.1.2 - 2006-11-24 (r3844)
close WinMerge if Open-dialog is canceled when started
from command line (#1600714)
BugFix: project files didn't work (loaded right-side path
for both sides) (#1600000)
BugFix: location pane misdrawn when word-wrap enabled (#1584068)
WinMerge 2.7.1.1 - 2006-11-16 (r3810)
Use expat + scew for XML handling (partially converted) (1587574)
Uses PCRE for regular expressions (partially converted) (#1591605)
New folder compare icons (#1586705)
New bookmarks icons (#1586689)
Manifest files in resource, no need for separate files (#1588212)
BugFix: WinMerge/Filters folder was always created (#1578419)
BugFix: modality problems in file selection dialogs (#1586869)
BugFix: crash if file modification time was missing (#1589563)
BugFix: /x parameter didn't work with some other parameters (#1564283)
BugFix: asked sometimes twice about saving modified files (#1596692)
WinMerge 2.7.4 and earlier (also 2.6.x stable releases) have more detailed
changelogs in Changes.txt files in /Src and other folders.

59
WinMergePortable/App/WinMerge/Docs/ReadMe-Basque.txt Normal file
View File

@@ -0,0 +1,59 @@
WINMERGE
WinMerge Windowserako Iturri Irekiko alderaketa eta batuketa tresna bat da.
WinMergek bi agiritegi eta bi agiri alderatu ditzake, ezberdintasunak ulertzeko
eta kudeatzeko erraza den ikus idazki heuskarrian aurkeztuz.
WinMergek kanpoko ezberdintze/batze tresna bezala erabili daiteke edo aplikazio aske bezala.
WinMerge oso lagungarria da alderaketak, aldiberetzeak eta batuketak ahalik eta errazen eta erabilgarrien egiteko.
Programazio hizkuntza ugari eta beste agiri heuskarriak joskera-nabarmenduak dira.
WinMergeren azken bertsioa eta WinMerge argibideak eskuragarri daude hemen:
http://winmerge.org/.
Hasiera Azkarra
===========
WinMerge ezarri ondorengo ohinarrizko eragiketak nola egin jakiteko, klikatu
Laguntza>WinMerge Laguntza eta nabigatu Hasiera Azkarra gaian. Edo, joan Webgune
bertsio honetara: http://manual.winmerge.org/QuickStart.html.
WinMerge Laguntza
=============
WinMerge Laguntza ordenagailuan ezartzen da Microsoft HTML Laguntza agiri bezala, WinMerge.chm,
WinMerge ezartzen duzunean. Laguntza irekitzeko, klikatu Laguntza>WinMerge Laguntza edo sakatu F1
WinMerge leihoan. Komando lerroan, ekin WinMerge exekutagarriari /? laguntza giltzarekin.
WinMerge Laguntzaren HTML bertsioa hemen ere bilatu dezakezu:
http://manual.winmerge.org/.
Agiri Sostengua
===============
WinMergek 7-Zip (http://www.7-zip.org) Iturri Irekiko agiri tresna erabiltzen du
agiri sostengua agiritegiratzeko. 7-Zip aplikazioa ezartzea gomendatzen dugu
jeitsiz eta abiaraziz 7-Zip plugin ezartzailea hemendik:
http://winmerge.org/downloads/.
Ezin baduzu 7-Zip tresna ezarri zerbaitengaitik, 7-zip plugin ezartzailea
erabili dezakezu agiri sostengurako beharrezkoak diren agiriak bakarrik ezarriz.
Ikusi Laguntza gaia, "7-Zip eta agiri sostengua" xehetasunetarako.
WinMerge Sostengua
================
Galderarik edo iradokizunik WinMergeri buruz? Hasteko toki on bat WinMerge
herkidego boletina da: http://forums.winmerge.org/. Garatzaileek sarri irakurtzen
eta erantzuten dizkiete galderei bi eztabaidaguneetan. Erabili Ireki Eztabaida gunea
WinMergeri buruzko galdera orokorrak egiteko. Erabili Garatzaile eztabaidagunea
WinMergeren garapenari buruzko galderentzat.
Akatsak eta Eginkizun Eskabideak
=========================
Gairen bat konpondu gabe badago WinMerge eztabaidagunetan, egiaztatu egitasmo
aztarnariak hona joz: http://project.winmerge.org/, eta klikatu Aztarnarien menuko
loturan, Akatsak eta Eginkizun Eskabideak, non gaiak bilatu edo aurkeztu ahal izango dituzun.
Akats bat aurkezten baduzu, mesedez barneratu WinMerge bertsio zenbakia zure jakinarazpenean.
Ohar itxurapen bat sortu dezakezu klikatuz Laguntza>Itxurapena.
Mesedez jaso itxurapen ohar-agiria akats jakinarazpenean; argibide oso erabilgarriak ditu garatzaileentzat.
- WinMerge Garatzaileak

38
WinMergePortable/App/WinMerge/Docs/ReadMe-Brazilian.txt Normal file
View File

@@ -0,0 +1,38 @@
WINMERGE
WinMerge <20> um utilit<69>rio de compara<72><61>o e uni<6E>o de arquivos com o c<>digo fonte aberto o qual roda em todas as vers<72>es modernas do windows. Algumas fun<75><6E>es requerem instala<6C><61>es ou componentes adicionais. A <20>ltima vers<72>o do WinMerge e outras informa<6D><61>es do WinMerge est<73>o dispon<6F>veis em
http://winmerge.org
In<49>cio r<>pido para o WinMerge: Leia o cap<61>tulo do in<69>cio r<>pido do manual online para se iniciar com o WinMerge:
http://manual.winmerge.org/QuickStart.html
Manual em HTML: O manual est<73> dispon<6F>vel online em
http://manual.winmerge.org/ ele est<73> tamb<6D>m possivelmente instalado (se escolhido assim) localmente e descarreg<65>vel separadamente de http://winmerge.org/ (veja a documenta<74><61>o) Suporte para Arquivos: O
WinMerge usa o 7-Zip para o suporte para arquivos dentro de arquivos. 7-Zip (http://www.7-zip.org) <20> uma ferramenta para arquivos com o c<>digo fonte aberto. Para instalar o suporte para arquivos dentro de arquivos, baixe o instalador do plugin do 7-Zip de http://winmerge.org/
Instalando o suporte para arquivos: <20> recomendado instalar o aplicativo 7-Zip. Se isto n<>o pode ser feito por alguma raz<61>o, o instalador do plugin do 7-Zip pode instalar apenas os arquivos necess<73>rios para ativar o suporte para arquivos dentro dos arquivos. Note que N<>O permite o uso isolado do 7-Zip, apenas o suporte para arquivos para oWinMerge.
Suporte a Scripts:
Se voc<6F> gostaria de trabalhar com scripts Voc<6F> precisar<61> ter o Windows
Scripting Host instalado. Se voc<6F> receber quaisquer erros relacionados aos seus
scripts por favor visite
http://msdn.microsoft.com/library/default.asp?url=/downloads/list/webdev.asp
para ter certeza que seu Scripting Host est<73> ambos atualizado e n<>o corrompido.
Suporte:
Os desenvolvedores est<73>o respondendo as quest<73>es nos f<>runs do WinMerge em Sourceforge.net:
http://sourceforge.net/forum/?group_id=13216
Bugs e pedidos para fun<75><6E>es:
Bugs e sugest<73>es para novas fun<75><6E>es devem ser submetidos nos trackers dos bugs e pedidos para fun<75><6E>es no sourceforge.net.
Bug tracker:
http://sourceforge.net/tracker/?group_id=13216&atid=113216 quando reportando um bug, por favor nos diga o n<>mero da vers<72>o do WinMerge! As vers<72>es do
WinMerge2.2.0 e posterior podem emitir um 'Log da Configura<72><61>o' no
menu Ajuda/Configura<72><61>o. Por favor anexe esta info (como anexo do arquivo) ao relat<61>rio sobre o bug, ele tem muita informa<6D><61>o <20>til para os desenvolvedores.
Tracker
RFE (pedido para fun<75><6E>es):
http://sourceforge.net/tracker/?group_id=13216&atid=363216
- Os Desenvolvedores do WinMerge

61
WinMergePortable/App/WinMerge/Docs/ReadMe-Bulgarian.txt Normal file
View File

@@ -0,0 +1,61 @@
WINMERGE
WinMerge <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> WinMerge, <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>:
http://winmerge.org
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> WinMerge:
<EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> WinMerge:
http://manual.winmerge.org/QuickStart.html
HTML <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>:
http://manual.winmerge.org/
<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>) <20><><EFBFBD> <20><> <20><>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> http://winmerge.org/ (<28><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
WinMerge <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 7-Zip <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. 7-Zip (http://www.7-zip.org)
<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>. <20><> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (plugin) <20><> 7-Zip <20><>
http://winmerge.org/.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 7-Zip. <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><>
<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> 7-zip
<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> 7-Zip, <20> <20><><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> WinMerge.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Windows Scripting Host. <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
http://msdn.microsoft.com/library/default.asp?url=/downloads/list/webdev.asp
<EFBFBD><EFBFBD> <20><> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD><EFBFBD> Scripting Host <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> WinMerge <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>
Sourceforge.net <20><> <20><><EFBFBD><EFBFBD><EFBFBD>:
http://sourceforge.net/forum/?group_id=13216
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> RFE <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> sourceforge.net.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
http://sourceforge.net/tracker/?group_id=13216&atid=113216
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> WinMerge!
WinMerge <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 2.2.0 <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>
'<27><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>... <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>) <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> RFE (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>):
http://sourceforge.net/tracker/?group_id=13216&atid=363216
- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> WinMerge

58
WinMergePortable/App/WinMerge/Docs/ReadMe-Catalan.txt Normal file
View File

@@ -0,0 +1,58 @@
WINMERGE
El WinMerge <20>s una utilitat de comparaci<63> i combinaci<63> de fitxers de codi obert
que corre a totes les versions modernes del Windows. Algunes caracter<65>stiques
requereixen d'instal<61>lacions o components addicionals.
La darrera versi<73> del WinMerge i altra informaci<63> del mateix <20>s troba disponible a
http://winmerge.org
Inici r<>pid amb el WinMerge:
Llegiu el cap<61>tol Quick-start del manual en l<>nia per a comen<65>ar amb el WinMerge:
http://manual.winmerge.org/QuickStart.html
Manual HTML:
El manual est<73> disponible en l<>nia a
http://manual.winmerge.org/
Possiblement tamb<6D> estigui instal<61>lada localment (si aix<69> es va triar) i es pot
baixar separadament des de http://winmerge.org/ (veieu la documentaci<63>)
Suport d'arxivament:
El WinMerge empra el 7-Zip per al suport de fitxers d'arxivament. 7-Zip
(http://www.7-zip.org) <20>s una eina d'arxivament de codi obert. Per tal d'instal<61>lar el
suport de fitxers d'arxivament, baixeu l'instal<61>lador del connector del 7-Zip des de
http://winmerge.org/.
Tot instal<61>lant el suport d'arxivament:
Es recomana instal<61>lar l'aplicaci<63> del 7-Zip. De no ser possible per qualsevol motiu,
l'instal<61>lador del connector del 7-zip pot instal<61>lar els fitxers necessaris per tal de
permetre el suport de fitxers d'arxivament. Pareu compte que aix<69> NO permet d'usar
el 7-Zip de forma independent, nom<6F>s el suport d'arxivament del WinMerge.
Suport de seq<65><71>ncies:
Per tal de treballar amb fitxers de seq<65><71>ncies caldr<64> tenir el Windows Scripting Host
instal<EFBFBD>lat. Si rebeu qualsevol error relacionat amb els vostres fitxers de seq<65><71>ncies
visiteu
http://msdn.microsoft.com/library/default.asp?url=/downloads/list/webdev.asp
per tal d'assegurar-vos que el vostre Scripting Host est<73> actualitzat i no corromput.
Suport:
Els desenvolupadors miren de respondre questions als forums del WinMerge a Sourceforge.net:
http://sourceforge.net/forum/?group_id=13216
Errors i peticions de caracter<65>stiques:
Es recomana que envieu els errors i els suggeriments per a noves caracteristiques
als seguidors (trackers) d'errors i peticions de millores (RFE) a sourceforge.net.
Seguidor d'errors (Bug tracker):
http://sourceforge.net/tracker/?group_id=13216&atid=113216
En reportar un error, si us plau digueu-nos el n<>mero de versi<73> del WinMerge!
Les versions del WinMerge 2.2.0 i posteriors poden generar un registre de
configuraci<EFBFBD> 'Configuration Log' des del men<65> Ajuda/Configuraci<63>. Adjunteu (com a
fitxer adjunt) a l'informe de l'error, cont<6E> molta informaci<63> util per als desenvolupadors.
Seguidor de petici<63> de millores (RFE tracker):
http://sourceforge.net/tracker/?group_id=13216&atid=363216
Els desenvolupadors del WinMerge

49
WinMergePortable/App/WinMerge/Docs/ReadMe-ChineseSimplified.txt Normal file
View File

@@ -0,0 +1,49 @@
WINMERGE
WinMerge <20><>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD>Զ<EFBFBD><D4B6>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD>жԱ<D0B6><D4B1>Լ<EFBFBD><D4BC>ϲ<EFBFBD><CFB2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>е<EFBFBD>
Windowsƽ̨<EFBFBD>ϵĿ<EFBFBD>Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Щ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><EFBFBD><EFBFBD>ⰲװ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD>µ<EFBFBD> WinMerge <20>汾<EFBFBD>Լ<EFBFBD><D4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD><CFA2><EFBFBD>Դ<EFBFBD> http://winmerge.org <20>õ<EFBFBD><C3B5><EFBFBD>
WinMerge <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ţ<EFBFBD>
<EFBFBD><EFBFBD><EFBFBD>Ķ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֲ<EFBFBD><EFBFBD>ġ<EFBFBD>Quick-start<72><74><EFBFBD>½<EFBFBD><C2BD><EFBFBD><EFBFBD>˽Ⲣ<CBBD><E2B2A2>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD> WinMerge <20><>
http://manual.winmerge.org/QuickStart.html
HTML <20>ֲ᣺
<EFBFBD>û<EFBFBD><EFBFBD>ֲ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Դ<EFBFBD> http://manual.winmerge.org/ <20>õ<EFBFBD><C3B5><EFBFBD>Ҳ<EFBFBD><D2B2><EFBFBD><EFBFBD><EFBFBD>ڰ<EFBFBD>װʱѡ<CAB1><D1A1>
<EFBFBD><EFBFBD>װ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>أ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҳ<EFBFBD><EFBFBD><EFBFBD>Ե<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> http://winmerge.org/ <20><><EFBFBD>ء<EFBFBD>(<28>μ<EFBFBD><CEBC>ĵ<EFBFBD>)
ѹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>֧<EFBFBD>֣<EFBFBD>
WinMerge ʹ<><CAB9> 7-Zip ֧<><D6A7>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>7-Zip (http://www.7-zip.org) <20><>һ<EFBFBD><D2BB><EFBFBD><EFBFBD>Դ<EFBFBD>Ĵ<EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><EFBFBD>װѹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>֧<EFBFBD>֣<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> http://winmerge.org/ <20><><EFBFBD><EFBFBD> 7-Zip <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>װ
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD>װѹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>֧<EFBFBD>֣<EFBFBD>
<EFBFBD>Ƽ<EFBFBD><EFBFBD><EFBFBD>װ 7-Zip Ӧ<>ó<EFBFBD><C3B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ܰ<EFBFBD>װ<EFBFBD>Ļ<EFBFBD><C4BB><EFBFBD>7-Zip <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>װ<EFBFBD><D7B0><EFBFBD><EFBFBD>ֻ<EFBFBD>ᰲװ<E1B0B2><D7B0>Щ֧
<EFBFBD><EFBFBD>ѹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ע<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>½<EFBFBD>*<2A><><EFBFBD><EFBFBD>*<2A><><EFBFBD><EFBFBD>ʹ<EFBFBD><CAB9> 7-Zip<69><70>ֻ<EFBFBD><D6BB><EFBFBD><EFBFBD>
WinMerge <20><>֧<EFBFBD><D6A7>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD>ű<EFBFBD>֧<EFBFBD>֣<EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD>ýű<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><EFBFBD>װ Windows Script Host<73><74><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>κι<CEBA><CEB9>ڽű<DABD><C5B1><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD>⣬<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
http://msdn.microsoft.com/library/default.asp?url=/downloads/list/webdev.asp
<EFBFBD><EFBFBD>ȷ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Windows Script Host <20>Ѿ<EFBFBD><D1BE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
֧<EFBFBD>֣<EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ա<EFBFBD><EFBFBD><EFBFBD><EFBFBD> Sourceforge.net <20><> WinMerge <20><><EFBFBD><EFBFBD><EFBFBD>ش<EFBFBD><D8B4><EFBFBD><EFBFBD>⣬<EFBFBD><E2A3AC>ַ<EFBFBD><D6B7><EFBFBD>£<EFBFBD>
http://sourceforge.net/forum/?group_id=13216
Bug <20>͹<EFBFBD><CDB9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Bug <20>Ͷ<EFBFBD><CDB6>¹<EFBFBD><C2B9>ܵĽ<DCB5><C4BD><EFBFBD>Ӧ<EFBFBD><D3A6><EFBFBD>ύ<EFBFBD><E1BDBB> sourceforge.net <20><> bug <20><> RFE trackers <20>ϡ<EFBFBD>
Bug tracker:
http://sourceforge.net/tracker/?group_id=13216&atid=113216
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ύ bug ʱ<><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> WinMerge <20>İ汾<C4B0>ţ<EFBFBD>
WinMerge 2.2.0 <20><><EFBFBD><EFBFBD><EFBFBD>ϰ汾<CFB0><E6B1BE><EFBFBD><EFBFBD>ѡ<EFBFBD><D1A1><EFBFBD>˵<EFBFBD><CBB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD>á<EFBFBD><C3A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD><CFA2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD>ļ<EFBFBD><EFBFBD>Ը<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ķ<EFBFBD>ʽ<EFBFBD>ӵ<EFBFBD> bug <20><><EFBFBD><EFBFBD><EFBFBD>У<EFBFBD><D0A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڿ<EFBFBD><DABF><EFBFBD><EFBFBD><EFBFBD>Ա<EFBFBD>dz<EFBFBD><C7B3><EFBFBD><EFBFBD>õ<EFBFBD><C3B5><EFBFBD>Ϣ<EFBFBD><CFA2>
RFE (<28><><EFBFBD><EFBFBD>) tracker:
http://sourceforge.net/tracker/?group_id=13216&atid=363216
- WinMerge <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ա

38
WinMergePortable/App/WinMerge/Docs/ReadMe-ChineseTraditional.txt Normal file
View File

@@ -0,0 +1,38 @@
WINMERGE
WinMerge <20>O Windows <20>@<40>~<7E>t<EFBFBD>ΤU<CEA4><55><EFBFBD>B<EFBFBD>}<7D>񷽽X<F1B7BDBD><58><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>P<EFBFBD>X<EFBFBD>֪<EFBFBD><D6AA>u<EFBFBD><75><EFBFBD>CWinMerge <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƨ<EFBFBD><C6A7>P<EFBFBD>ɮסA<D7A1>H<EFBFBD><48><EFBFBD><EFBFBD><EFBFBD>ݨ<EFBFBD><DDA8><EFBFBD><EFBFBD>媺<EFBFBD><E5AABA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B<EFBFBD>z<EFBFBD><7A><EFBFBD>覡<EFBFBD>A<EFBFBD>e<EFBFBD>{<7B><><EFBFBD><EFBFBD><EFBFBD>X<EFBFBD><58><EFBFBD>t<EFBFBD><74><EFBFBD>CWinMerge <20>i<EFBFBD>H<EFBFBD>W<EFBFBD>߹B<DFB9>ΡA<CEA1>]<5D>i<EFBFBD>H<EFBFBD><48><EFBFBD><EFBFBD><EFBFBD>Y<EFBFBD>Ӥ<EFBFBD><D3A4><EFBFBD><EFBFBD>t<EFBFBD><74>/<2F>X<EFBFBD>֤u<D6A4>㪺<EFBFBD>~<7E><><EFBFBD>s<EFBFBD>边<EFBFBD>C
WinMerge <20><><EFBFBD>\<5C>h<EFBFBD><68><EFBFBD>Ϊ<EFBFBD><CEAA>\<5C><><EFBFBD>ϱo<CFB1><6F><EFBFBD><EFBFBD><EFBFBD>B<EFBFBD>P<EFBFBD>ơB<C6A1>X<EFBFBD>֧<EFBFBD><D6A7>[<5B>e<EFBFBD><65><EFBFBD>C<EFBFBD>\<5C>h<EFBFBD>{<7B><><EFBFBD>y<EFBFBD><79><EFBFBD>M<EFBFBD>ɮ׮榡<D7AE><E6A6A1><EFBFBD>H<EFBFBD>y<EFBFBD>k<EFBFBD><6B><EFBFBD>G<EFBFBD><47><EFBFBD><EFBFBD><EFBFBD>ܡC
WinMerge <20>̷s<CCB7><73><EFBFBD>P<EFBFBD><50><EFBFBD>T<EFBFBD>b<EFBFBD>Ghttp://winmerge.org/
<EFBFBD>ߧY<EFBFBD>W<EFBFBD><EFBFBD>
===========
<EFBFBD>w<EFBFBD>˫<EFBFBD><EFBFBD>A<EFBFBD>Dz߰򥻾ާ@<40>A<EFBFBD><41> <20><><EFBFBD><EFBFBD> > WinMerge <20><><EFBFBD><EFBFBD><EFBFBD>C<EFBFBD>s<EFBFBD><73> Quick Start <20><><EFBFBD>C<EFBFBD>Φ<EFBFBD> http://manual.winmerge.org/QuickStart.html <20>s<EFBFBD><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>C
WinMerge <20><><EFBFBD><EFBFBD>
=============
<EFBFBD>w<EFBFBD><EFBFBD> WinMerge <20>ɡA<C9A1>仡<EFBFBD><E4BBA1><EFBFBD>ɦb<C9A6>a<EFBFBD>w<EFBFBD>˦<EFBFBD> Microsoft HTML Help <20><> ( WinMerge.chm)<29>C<EFBFBD>}<7D>һ<EFBFBD><D2BB><EFBFBD><EFBFBD>ɡA<C9A1><41><EFBFBD>GHelp > WinMerge <20><><EFBFBD><EFBFBD><EFBFBD>C<EFBFBD>Ω<EFBFBD>WinMerge <20><><EFBFBD>A<EFBFBD><41> F1<46>C<EFBFBD><43><EFBFBD>R<EFBFBD>O<EFBFBD>C<EFBFBD>A<EFBFBD>h<EFBFBD>H "/?" <20>Ѽư<D1BC><C6B0><EFBFBD> WinMerge <20><><EFBFBD>i<EFBFBD><69><EFBFBD><EFBFBD><EFBFBD>ɡC
<EFBFBD>z<EFBFBD>]<5D>i<EFBFBD>H<EFBFBD><48> http://manual.winmerge.org/ <20>s<EFBFBD><73><EFBFBD><EFBFBD>HTML <20><><EFBFBD>C
<EFBFBD><EFBFBD><EFBFBD>Y<EFBFBD>䴩
===============
WinMerge <20><> 7-Zip (http://www.7-zip.org) <20>}<7D>񷽽X<F1B7BDBD><58><EFBFBD>Y<EFBFBD>u<EFBFBD><75><EFBFBD>Ӥ䴩<D3A4><E4B4A9><EFBFBD>Y<EFBFBD>ɡC<C9A1>ڭ̫<DAAD>ij<EFBFBD>U<EFBFBD><55><EFBFBD>w<EFBFBD><77> 7-Zip<69>A<EFBFBD>è<EFBFBD> http://winmerge.org/downloads/ <20>U<EFBFBD><55> 7-Zip <20>~<7E><><EFBFBD>w<EFBFBD>˾<EFBFBD> (plugin installer)<29>A<EFBFBD><41><EFBFBD>椧<EFBFBD>C
<EFBFBD>Y<EFBFBD>z<EFBFBD><EFBFBD><EFBFBD>z<EFBFBD><EFBFBD><EFBFBD>z<EFBFBD>Ѥ<EFBFBD><EFBFBD>w<EFBFBD><EFBFBD> 7-Zip<69>A7-Zip <20>~<7E><><EFBFBD>w<EFBFBD>˾<EFBFBD><CBBE>i<EFBFBD><69><EFBFBD>ܶȦw<C8A6>ˤ䴩<CBA4><E4B4A9><EFBFBD>Y<EFBFBD>һݪ<D2BB><DDAA>ɮסC<D7A1>Ӹ`<60>аѦһ<D1A6><D2BB><EFBFBD><EFBFBD>ɤ<EFBFBD><C9A4><EFBFBD><EFBFBD>u7-Zip <20>P<EFBFBD><50><EFBFBD>Y<EFBFBD>䴩<EFBFBD>v<EFBFBD><76> (7-Zip and archive support)<29>C
WinMerge <20>䴩
================
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> WinMerge <20><><EFBFBD><EFBFBD><EFBFBD>D<EFBFBD>Ϋ<EFBFBD>ij<EFBFBD>ܡH<DCA1>Ш<EFBFBD> http://forums.winmerge.org/ <20><> WinMerge <20><><EFBFBD>s<EFBFBD>Q<EFBFBD>װϡC<CFA1><43><EFBFBD>o<EFBFBD>̱`<60>|<7C>\Ū<>P<EFBFBD>^<5E><><EFBFBD><EFBFBD><EFBFBD>ӰQ<D3B0>װϤ<D7B0><CFA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>D<EFBFBD>C<EFBFBD>@<40><><EFBFBD>ʪ<EFBFBD>ij<EFBFBD>D<EFBFBD>A<EFBFBD><41><EFBFBD>ϥΤW<CEA4><57><EFBFBD><EFBFBD><EFBFBD>D<EFBFBD>A<EFBFBD>Ш줽<D0A8>}<7D>Q<EFBFBD>װ<EFBFBD> (Open Discussion forum)<29>C<EFBFBD><43><EFBFBD>o<EFBFBD>W<EFBFBD><57>ij<EFBFBD>D<EFBFBD>A<EFBFBD>Ш<EFBFBD><D0A8><EFBFBD><EFBFBD>o<EFBFBD>Q<EFBFBD>װ<EFBFBD> (Developers forum)<29>C
<EFBFBD>{<7B><><EFBFBD><EFBFBD><EFBFBD>~<7E>P<EFBFBD>\<5C><><EFBFBD>W<EFBFBD>q
=========================
<EFBFBD>Y<EFBFBD>@<40><>ij<EFBFBD>D<EFBFBD>b<EFBFBD>Q<EFBFBD>װϤ<D7B0><CFA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѨM<D1A8>A<EFBFBD>i<EFBFBD><69><EFBFBD>p<EFBFBD>e ( http://project.winmerge.org/) <20><><EFBFBD><EFBFBD><EFBFBD>l<EFBFBD>ܾ<EFBFBD> (Tracker) <20>d<EFBFBD>ݡA<DDA1>ë<EFBFBD><C3AB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>檺<EFBFBD>s<EFBFBD><73> (Ĵ<>p<EFBFBD>ABugs <20><> Feature Requests)<29>A<EFBFBD>쨺<EFBFBD>̴N<CCB4>i<EFBFBD>H<EFBFBD>s<EFBFBD><73><EFBFBD>δ<EFBFBD><CEB4>X<EFBFBD>z<EFBFBD><7A><EFBFBD>Q<EFBFBD>k<EFBFBD>C
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>~<7E>ɽЪ<C9BD><D0AA>W<EFBFBD>ҥΪ<D2A5> WinMerge <20><><EFBFBD><EFBFBD><EFBFBD>s<EFBFBD><73><EFBFBD>C<EFBFBD><43> <20><><EFBFBD><EFBFBD> > <20>պA<D5BA>A<EFBFBD>i<EFBFBD><69><EFBFBD>ͲպA<D5BA><41><EFBFBD><EFBFBD><EFBFBD>ɡC<C9A1>N<EFBFBD><4E><EFBFBD>ɪ<EFBFBD><C9AA><EFBFBD><EFBFBD>z<EFBFBD><7A><EFBFBD><EFBFBD><EFBFBD>~<7E><><EFBFBD><EFBFBD><EFBFBD>F<EFBFBD><46><EFBFBD>ɦ<EFBFBD><C9A6>\<5C>h<EFBFBD><68><EFBFBD>Ϊ<EFBFBD><CEAA><EFBFBD><EFBFBD>T<EFBFBD><54><EFBFBD><EFBFBD><EFBFBD>o<EFBFBD>̡C
WinMerge <20><><EFBFBD>o<EFBFBD>ζ<EFBFBD>

61
WinMergePortable/App/WinMerge/Docs/ReadMe-Croatian.txt Normal file
View File

@@ -0,0 +1,61 @@
WINMERGE
WinMerge je Windows otvoreni program za usporedbu i spajanje. WinMerge mo<6D>e
usporediti i datoteke i mape, prikazuju<6A>i i isti<74>u<EFBFBD>i razlike teksta tako da su
uo<EFBFBD>ljive i lako se njima rukuje. WinMerge se mo<6D>e koristiti kao vanjaki alat
ili samostalni program.
WinMerge ima puno vrlo korisnih svojstava koja omogu<67>uju sinhroniziranje i
spajanje na najjednostavniji mogu<67>i na<6E>in. Za nekoliko programskih jezika i
tipova datoteka istaknuta je sintaksa.
Najnoviju WinMerge ina<6E>icu i WinMerge obavijesti su dostupna na
http://winmerge.org/.
Quick start
===========
Pokrnuli ste WinMerge, kliknite Pomo<6D> --> Quick start i nau<61>ite kako koristiti
osnovne mogu<67>nosti, ili po<70>ite na Internet i posjetite
http://manual.winmerge.org/QuickStart.html.
WinMerge Pomo<6D>
=============
WinMerge Pomo<6D> se instalira na disk kao Microsoft HTML Help datoteka, naziva
WinMerge.chm, u mapi WinMerge. Otvara se klikom na Pomo<6D> --> WinMerge Help ili
pritiskom tipke F1 u izborniku programa WinMerge. S komandne linije pokre<72>e se
naredbom, /? help.
Na internetu na http://manual.winmerge.org/ tako<6B>er mo<6D>ete pregledati
WinMerge Help.
Podr<EFBFBD>ka arhiva
===============
WinMerge koristi 7-Zip (http://www.7-zip.org) otvoreni arhiver program.
Preporu<EFBFBD>ujemo instaliranje 7-Zip programa preuzimanjem 7-Zip instalacijskog
dodatka s http://winmerge.org/downloads/.
Ako zbog ne<6E>ega ne <20>elite 7-Zip program, koristite 7-zip instalacijski dodatak
koji <20>e instalirati samo nu<6E>ne datoteke podr<64>ke. Vi<56>e o tome pogledajte u
pomo<EFBFBD>i, poglavlje, "7-Zip and archive support".
WinMerge podr<64>ka
================
Pitanja i sugestije o WinMerge? Pravo mjesto za to je WinMerge zajedni<6E>ki forum
na http://forums.winmerge.org/. Programeri <20>esto <20>itaju i odgovaraju na pitanja.
Koristite Open Discussion forum za op<6F>a WinMerge pitanja, kao npr., pitanja o
kori<EFBFBD>tenju. Koristite programerski forum za WinMerge programerska pitanja.
Bugovi i <20>eljena svojstva
=========================
Kad ne<6E>to primijetite, po<70>ite na Internet WinMerge forums, odaberite trackers:
na http://project.winmerge.org/, i kliknite <20>eljeno s izbornika, npr. Bugs ili
Feature Requests, i pregledajte ve<76> postoje<6A>a javljanja.
Ako <20>aljete bug, molimo vas navedite broj WinMerge ina<6E>ice koju koristite.
Mo<EFBFBD>ete uklju<6A>iti zapis pode<64>enosti ako kliknete na Pomo<6D>>Pode<64>enost. Uz
izvje<EFBFBD>taj o bugu molimo uklju<6A>ite i zapis pode<64>enosti; on sadr<64>i puno korisnih
informacija za nas, programere.
- WinMerge programeri

63
WinMergePortable/App/WinMerge/Docs/ReadMe-Dutch.txt Normal file
View File

@@ -0,0 +1,63 @@
WINMERGE
WinMerge is een Open Source vergelijkings- en samenvoegingstool voor Windows.
WinMerge kan mappen en bestanden vergelijken, verschillen voorstellend in een visueel
tekstformaat dat gemakkelijk te begrijpen en handelbaar is. WinMerge kan gebruikt
worden als een externe vergelijkings-/samenvoegingstoepassing of als een
standalone-toepassing.
WinMerge heeft vele handige ondersteunende functies om vergelijken, synchroniseren
en samenvoegen zo gemakkelijk en bruikbaar mogelijk te maken. Verschillende
programmeertalen en andere bestandsformaten zijn syntax-gemarkeerd.
De laatste WinMerge-versie en WinMerge-informatie is beschikbaar op
http://winmerge.org/.
Quickstart
==========
om te leren hoe u basisoperaties uitvoert na de installatie van WinMerge klikt u op
Help > WinMerge Help en navigeert u naar het Quickstart-topic. U kan ook naar de
webversie gaan op http://manual.winmerge.org/QuickStart.html.
WinMerge-help
=============
WinMerge-help wordt lokaal ge<67>nstalleerd als een HTML helpbestand, WinMerge.chm,
op het moment dat u WinMerge installeert. Om Help te openen klikt u op
Help > WinMerge Help of drukt u F1 in het WinMerge-venster. In de opdrachtregel
start u het uitvoerbestand van WinMerge (WinMerge.exe) met de /? help-switch.
U kan ook surfen naar de HTML-version van WinMerge-help op
http://manual.winmerge.org/.
Archiefondersteuning
====================
WinMerge gebruikt de 7-Zip (http://www.7-zip.org) Open Source archiveringstool
voor archiefbestand-ondersteuning. We raden aan dat u de 7-Zip-toepassing installeert
door de 7-Zip plugin-installer te downloaden van http://winmerge.org/downloads/
en te openen.
Indien u om een of andere reden de 7-Zip-tool niet kan installeren, kan u de 7-Zip
plugin-installer gebruiken om alleen de benodigde bestanden te installeren voor archiefbestand-ondersteuning. Zie het Help-topic "7-Zip en archiefondersteuning"
voor details.
WinMerge-ondersteuning
======================
Vragen over WinMerge of suggesties? Een goeie plaats om te beginnen is het WinMerge
community bulletin board op http://forums.winmerge.org/. Ontwikkelaars lezen en beantwoorden
frequent vragen op beide forums. Gebruik het "Open Discussion"-forum voor algemene
WinMerge-problemen, zoals gebruiksvragen. Gebruik het "Developers"-forum voor
WinMerge-ontwikkelingsproblemen.
Bugs en functie-aanvragen
=========================
Indien een probleem niet opgelost raakt op de WinMerge-forums, kan u de project-trackers
natrekken: ga naar http://project.winmerge.org/ en klik op een link in het "Trackers"-menu,
zoals "Bugs and Feature Requests", waar u kan browsen of items inzenden.
Indien u een bug rapporteert, gelieve dan het WinMerge-versienummer in uw rapport bij te
voegen. U kan een configuratielog genereren door te klikken op Help > Configuratie.
Gelieve de configuratielog bij het bugrapport te voegen; het heeft veel nuttige informatie
voor ontwikkelaars.
- De WinMerge-ontwikkelaars

74
WinMergePortable/App/WinMerge/Docs/ReadMe-French.txt Normal file
View File

@@ -0,0 +1,74 @@
WINMERGE
WinMerge est un outil en logiciel libre pour comparer et fusionner des fichiers
sur Windows. WinMerge peut comparer des r<>pertoires et des fichiers en pr<70>sentant
les diff<66>rences de texte dans un format visuel facile <20> comprendre et manipuler.
WinMerge peut <20>tre utilis<69> comme un outil externe de comparaison/fusion ou
comme application autonome.
WinMerge poss<73>de de nombreuses fonctionnalit<69>s utiles pour rendre la comparaison,
la synchronisation, et la fusion aussi facile et pratique que possible. Plusieurs
langages de programmation et autres formats de fichiers ont une syntaxe mise en
<EFBFBD>vidence.
La derni<6E>re version de WinMerge et d'autre information sont disponible a:
http://winmerge.org
D<EFBFBD>marrage rapide
================
Pour apprendre comment effectuer des op<6F>rations de base apr<70>s l'installation
de WinMerge, cliquez sur Aide > Rubrique d'aide WinMerge et acc<63>dez <20> la
rubrique D<>marrage rapide. Ou lisez le manuel en ligne <20>:
http://manual.winmerge.org/QuickStart.html
Aide WinMerge
=============
L'aide WinMerge est install<6C> localement comme un fichier d'aide HTML de
Microsoft, WinMerge.chm, lorsque vous installez WinMerge. Pour ouvrir l'aide,
cliquez sur Aide > Rubrique d'aide WinMerge ou appuyez sur F1 dans la fen<65>tre
WinMerge. Avec la ligne de commande, lancez l'ex<65>cutable WinMerge
suivi du commutateur d'aide /?.
Vous pouvez aussi consulter la version en ligne de l'aide WinMerge <20>:
http://manual.winmerge.org/
Support d'archive
=================
WinMerge utilise le logiciel libre 7-Zip (http://www.7-zip.org) comme
l'outil d'archivage pour le support d'archivage de fichier.
Nous recommandons l'installation de l'application 7-Zip en
t<EFBFBD>l<EFBFBD>chargeant et ex<65>cutant le plugiciel d'installation 7-Zip depuis
http://winmerge.org/downloads/
Si vous ne pouvez pas installer l'outil 7-Zip pour une raison quelconque.
Vous pouvez utiliser le plugiciel d'installation 7-Zip pour installer
uniquement les fichiers n<>cessaires au support d'archivage de fichier.
Voir la rubrique d'aide "7-Zip et support d'archives" pour plus de d<>tails.
Support WinMerge
================
Questions ou suggestions <20> propos de WinMerge? Une bonne place pour d<>buter
est le groupe de discussion WinMerge au http://forums.winmerge.org/. Les
d<EFBFBD>veloppeurs lisent et r<>pondent fr<66>quemment aux questions des deux forums.
Utilisez le forum de discussion ouverte pour des questions d'ordre g<>n<EFBFBD>ral
comme l'utilisation. Utilisez le forum des d<>veloppeurs pour des questions
de d<>veloppement WinMerge.
Bogues et nouvelles requ<71>tes
============================
Si un probl<62>me n'est pas r<>solu dans les forums WinMerge, v<>rifiez le traqueur
de projet <20>: http://project.winmerge.org/, et cliquez sur un des lien du menu
du traqueur, comme bogues et nouvelles requ<71>tes, o<> vous pouvez consulter ou
soumettre des articles.
Si vous soumettez un bogue, veuillez inclure le num<75>ro de version de WinMerge
dans votre rapport. Vous pouvez g<>n<EFBFBD>rer un journal de configuration en cliquant
sur Aide > Configuration. S'il vous pla<6C>t joignez le journal de configuration
<EFBFBD> votre rapport de bogue, il contient beaucoup d'informations utiles
pour les d<>veloppeurs.
- Les D<>veloppeurs de WinMerge

65
WinMergePortable/App/WinMerge/Docs/ReadMe-Galician.txt Normal file
View File

@@ -0,0 +1,65 @@
O WINMERGE
O WinMerge <20> unha ferramenta Open Source de comparaci<63>n e mestura para Windows.
O WinMerge pode comparar tanto arquivos como cartafoles, presentando as diferenzas
nun formato de texto visual que <20> moi sinxelo de entender e manexar. O WinMerge
pode empregarse como unha ferramenta externa de diferenciaci<63>n/mestura ou como
unha aplicaci<63>n independente.
O WinMerge ten varias funcionalidades de grande utilidade para facer comparaci<63>ns,
, sincronizar e mesturar do xeito m<>is doado e pragm<67>tico posible. Mesmo resalta o
texto segundo a sintaxe para diversos linguaxes de programaci<63>n e outros formatos de
arquivo.
A informaci<63>n e a <20>ltima versi<73>n do WinMerge est<73> dispo<70>ible en http://winmerge.org/.
Comezo r<>pido
===========
Para aprender como levar a cabo as operaci<63>ns b<>sicas logo de instalar o WinMerge,
preme en Axuda>Axuda do WinMerge e vai ao tema Quick start. Ou, podes visitar a
versi<EFBFBD>n Web en http://manual.winmerge.org/QuickStart.html.
Axuda do WinMerge
===============
A axuda do WinMerge instalase localmente como un arquivo de axuda Microsoft HTML,
WinMerge.chm, cando instalas o WinMerge. Para abrila, preme en Axuda>Axuda do
WinMerge ou preme F1 na fiestra do WinMerge. Se empregas a li<6C>a de comandos,
executa o WinMerge coa opci<63>n de axuda /?.
Tam<EFBFBD>n podes explorar a versi<73>n HTML da axuda do WinMerge en
http://manual.winmerge.org/.
Soporte de Arquivo
==============
O WinMerge emprega a ferramenta de arquivos Open Source 7-Zip (http://www.7-zip.org)
para ofrecer soporte de arquivo. Recomendamos instalar o 7-Zip descargando e
executando o instalador da extensi<73>n do 7-Zip en http://winmerge.org/downloads/.
Se non podes instalar o 7-Zip por alg<6C>n motivo, podes empregar o instalador da extensi<73>n
do 7-zip para instalar s<> os ficheiros requiridos para ter soporte de arquivo de ficheiros.
B<EFBFBD>talle un ollo ao tema "7-Zip and archive support" da axuda para obter pormenores sobre
o mesmo.
Soporte WinMerge
==============
Preguntas ou suxesti<74>ns verbo do WinMerge? Un bo lugar para comezar <20> o taboleiro
de mensaxes da comunidade do WinMerge en http://forums.winmerge.org/. Os
desenvolvedores len e responden de xeito frecuente <20>s cuesti<74>ns presentadas en <20>mbolos
dous foros. Emprega o foro de Discusi<73>n Aberta para cuesti<74>ns xerais do WinMerge,
como os temas relacionados co seu uso. Emprega o foro de Desenvolvedores para as
cuesti<EFBFBD>ns relativas ao desenrolo do WinMerge.
Erros e petici<63>ns de funcionalidades
==========================
Se unha cuesti<74>n non se resolve nos foros do WinMerge, comproba os rastrexadores do
proxecto: vai a http://project.winmerge.org/, e preme no men<65> dos Rastrexadores, como
Erros e Petici<63>ns de Funcionalidades, onde poder<65>s explorar ou enviar os elementos que
che interesen.
Se env<6E>a unha notificaci<63>n de erro, por favor, incl<63>e a versi<73>n do WinMerge na mesma.
Podes xerar un rexistro da configuraci<63>n premendo en Axuda>Configuraci<63>n.
Por favor, adxunta o rexistro da configuraci<63>n xerado <20> notificaci<63>n de erro, pois ten unha
morea de informaci<63>n moi <20>til para os desenvolvedores.
- The WinMerge Developers

77
WinMergePortable/App/WinMerge/Docs/ReadMe-Greek.txt Normal file
View File

@@ -0,0 +1,77 @@
WINMERGE
<EFBFBD><EFBFBD> WinMerge <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,
<EFBFBD><EFBFBD><EFBFBD> Windows. <20><> WinMerge <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><> WinMerge <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
<EFBFBD><EFBFBD> WinMerge <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> WinMerge <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> WinMerge <20><><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> http://winmerge.org.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
================
<EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>
WinMerge, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>><3E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> WinMerge <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
http://manual.winmerge.org/QuickStart.html
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> WinMerge
====================
<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> WinMerge <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> HTML <20><><EFBFBD>
Microsoft, WinMerge.chm, <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> WinMerge. <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>><3E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> WinMerge <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> F1 <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>
WinMerge. <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> WinMerge <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> /?.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> WinMerge <20><> <20><><EFBFBD><EFBFBD><EFBFBD> HTML <20><><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> http://manual.winmerge.org/.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
===============================
<EFBFBD><EFBFBD> WinMerge <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 7-Zip (http://www.7-zip.org) <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 7-Zip, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 7-Zip <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
http://winmerge.org/downloads/.
<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 7-Zip <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>,
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20>7-Zip <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> WinMerge
=======================
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> WinMerge; <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> WinMerge <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
http://forums.winmerge.org/. <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> forum (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>). <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>
forum <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> WinMerge, <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> forum <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> WinMerge.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Bugs) <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
=======================================================================
<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> forum <20><><EFBFBD> WinMerge, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
(trackers) <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> http://project.winmerge.org/,
<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> Trackers, <20><><EFBFBD><EFBFBD>
Bugs <20><><EFBFBD> Feature Requests, <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> WinMerge <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>><3E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
- <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> WinMerge

62
WinMergePortable/App/WinMerge/Docs/ReadMe-Japanese.txt Normal file
View File

@@ -0,0 +1,62 @@
WINMERGE
WinMerge<EFBFBD>́A<EFBFBD>I<EFBFBD>[<5B>v<EFBFBD><76><EFBFBD>\<5C>[<5B>X<EFBFBD>̔<EFBFBD><CC94>r<EFBFBD>E<EFBFBD>}<7D>[<5B>W<EFBFBD><57><EFBFBD>[<5B>e<EFBFBD>B<EFBFBD><42><EFBFBD>e<EFBFBD>B<EFBFBD>ł<EFBFBD><C582>B
WinMerge<EFBFBD>̓t<EFBFBD>H<EFBFBD><EFBFBD><EFBFBD>_<EFBFBD>ƃt<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̔<EFBFBD><CC94>r<EFBFBD><72><EFBFBD>ł<EFBFBD><C582>A<EFBFBD><41><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>₷<EFBFBD><E282B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>₷<EFBFBD><E282B7><EFBFBD><EFBFBD><EFBFBD>o<EFBFBD>I<EFBFBD><49>
<EFBFBD>e<EFBFBD>L<EFBFBD>X<EFBFBD>g<EFBFBD>t<EFBFBD>H<EFBFBD>[<5B>}<7D>b<EFBFBD>g<EFBFBD>ō<EFBFBD><C58D>ق<EFBFBD><D982>\<5C><><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B
WinMerge<EFBFBD>́A<EFBFBD>O<EFBFBD><EFBFBD><EFBFBD>̔<EFBFBD><EFBFBD>r<EFBFBD>E<EFBFBD>}<7D>[<5B>W<EFBFBD>c<EFBFBD>[<5B><><EFBFBD>Ƃ<EFBFBD><C682>Ďg<C48E><67><EFBFBD><EFBFBD><EFBFBD>Ƃ<EFBFBD><C682>A<EFBFBD>P<EFBFBD>̂Ŏg<C58E><67><EFBFBD><EFBFBD><EFBFBD>Ƃ<EFBFBD><C682>ł<EFBFBD><C582>܂<EFBFBD><DC82>B
WinMerge<EFBFBD>́A<EFBFBD><EFBFBD><EFBFBD>r<EFBFBD>⓯<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>}<7D>[<5B>W<EFBFBD><57><EFBFBD>ł<EFBFBD><C582><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȒP<C892>ɁA<C981>g<EFBFBD><67><EFBFBD>₷<EFBFBD><E282B7><EFBFBD><EFBFBD><EFBFBD>邽<EFBFBD><E982BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̖𗧂<CC96>
<EFBFBD>@<40>\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD><DC82>B<EFBFBD><42><EFBFBD><EFBFBD><EFBFBD>‚<EFBFBD><C282>̃v<CC83><76><EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƃ<EFBFBD><C682>̑<EFBFBD><CC91>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>t<EFBFBD>H<EFBFBD>[<5B>}<7D>b<EFBFBD>g<EFBFBD>́A
<EFBFBD><EFBFBD><EFBFBD>@<40>̋<EFBFBD><CC8B><EFBFBD><EFBFBD>\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B
<EFBFBD>ŐV<EFBFBD>ł<EFBFBD>WinMerge<EFBFBD>Ə<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɂ‚<EFBFBD><EFBFBD>ẮA<EFBFBD>ȉ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Q<EFBFBD>Ƃ<EFBFBD><EFBFBD>Ă<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B
http://winmerge.org/
<EFBFBD>N<EFBFBD>B<EFBFBD>b<EFBFBD>N<EFBFBD>X<EFBFBD>^<5E>[<5B>g
===========
WinMerge<EFBFBD><EFBFBD><EFBFBD>C<EFBFBD><EFBFBD><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>A<EFBFBD><41><EFBFBD>{<7B>I<EFBFBD>ȑ<EFBFBD><C891><EFBFBD><EFBFBD>̎d<CC8E><64><EFBFBD><EFBFBD><EFBFBD>m<EFBFBD>邽<EFBFBD>߂ɁA[<5B>w<EFBFBD><77><EFBFBD>v]<5D><><EFBFBD>j<EFBFBD><6A><EFBFBD>[<5B><>
[WinMerge<67>w<EFBFBD><77><EFBFBD>v]<5D><><EFBFBD>N<EFBFBD><4E><EFBFBD>b<EFBFBD>N<EFBFBD><4E><EFBFBD>A<EFBFBD>N<EFBFBD>C<EFBFBD>b<EFBFBD>N<EFBFBD>X<EFBFBD>^<5E>[<5B>g<EFBFBD>g<EFBFBD>s<EFBFBD>b<EFBFBD>N<EFBFBD><4E><EFBFBD>\<5C><><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B
<EFBFBD>܂<EFBFBD><EFBFBD>́AWeb<EFBFBD>o<EFBFBD>[<5B>W<EFBFBD><57><EFBFBD><EFBFBD><EFBFBD><EFBFBD>http://manual.winmerge.org/QuickStart.html
<EFBFBD><EFBFBD><EFBFBD>Q<EFBFBD>Ƃ<EFBFBD><EFBFBD>Ă<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B
WinMerge<EFBFBD>̃w<EFBFBD><EFBFBD><EFBFBD>v
=============
WinMerge<EFBFBD>̃w<EFBFBD><EFBFBD><EFBFBD>v<EFBFBD>́AMicrosoft HTML<4D>w<EFBFBD><77><EFBFBD>v <20>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD>WinMerge.chm<68>Ƃ<EFBFBD><C682>ăC<C483><43><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD>[<5B>J<EFBFBD><4A><EFBFBD>ɃC<C983><43><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B<EFBFBD>w<EFBFBD><77><EFBFBD>v<EFBFBD><76><EFBFBD>J<EFBFBD><4A><EFBFBD>ɂ́A[<5B>w<EFBFBD><77><EFBFBD>v]<5D><><EFBFBD>j<EFBFBD><6A><EFBFBD>[<5B><>[WinMerge<67>w<EFBFBD><77><EFBFBD>v]<5D><>
<EFBFBD>N<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>N<EFBFBD><EFBFBD><EFBFBD>邩<EFBFBD>AWinMerge<EFBFBD>E<EFBFBD>C<EFBFBD><EFBFBD><EFBFBD>h<EFBFBD>E<EFBFBD><EFBFBD>F1<EFBFBD>L<EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B
<EFBFBD>R<EFBFBD>}<7D><><EFBFBD>h<EFBFBD><68><EFBFBD>C<EFBFBD><43><EFBFBD>ł́A/? <20>w<EFBFBD><77><EFBFBD>v<EFBFBD>X<EFBFBD>C<EFBFBD>b<EFBFBD>`<60><><EFBFBD>‚<EFBFBD><C282><EFBFBD>WinMerge<67>̎<EFBFBD><CC8E>s<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>s<EFBFBD><73><EFBFBD>܂<EFBFBD><DC82>B
http://manual.winmerge.org/ <20><><EFBFBD><EFBFBD><EFBFBD>ł<EFBFBD>HTML<4D>ł<EFBFBD>WinMerge<67>w<EFBFBD><77><EFBFBD>v<EFBFBD><76><EFBFBD>{<7B><><EFBFBD><EFBFBD><EFBFBD>邱<EFBFBD>Ƃ<EFBFBD><C682>ł<EFBFBD><C582>܂<EFBFBD><DC82>B
<EFBFBD>A<EFBFBD>[<5B>J<EFBFBD>C<EFBFBD>u<EFBFBD>T<EFBFBD>|<7C>[<5B>g:
===============
WinMerge<EFBFBD>́A<EFBFBD>A<EFBFBD>[<5B>J<EFBFBD>C<EFBFBD>u<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43>(<28><><EFBFBD>k<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43>)<29>T<EFBFBD>|<7C>[<5B>g<EFBFBD><67>7-Zip<69><70><EFBFBD>g<EFBFBD>p<EFBFBD><70><EFBFBD>܂<EFBFBD><DC82>B
7-Zip( http://www.7-zip.org )<29>́A<CD81>I<EFBFBD>[<5B>v<EFBFBD><76><EFBFBD>\<5C>[<5B>X<EFBFBD>̃A<CC83>[<5B>J<EFBFBD>C<EFBFBD>u<EFBFBD>c<EFBFBD>[<5B><><EFBFBD>ł<EFBFBD><C582>B
<EFBFBD>A<EFBFBD>[<5B>J<EFBFBD>C<EFBFBD>u<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>T<EFBFBD>|<7C>[<5B>g<EFBFBD><67><EFBFBD>C<EFBFBD><43><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɂ́Ahttp://winmerge.org/downloads/
<EFBFBD><EFBFBD><EFBFBD><EFBFBD>7-Zip<69>v<EFBFBD><76><EFBFBD>O<EFBFBD>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>_<EFBFBD>E<EFBFBD><45><EFBFBD><EFBFBD><EFBFBD>[<5B>h<EFBFBD><68><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>A<EFBFBD>Ȃ<EFBFBD><EFBFBD>炩<EFBFBD>̗<EFBFBD><EFBFBD>R<EFBFBD><EFBFBD>7-Zip<69><70><EFBFBD>C<EFBFBD><43><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD>ł<EFBFBD><C582>Ȃ<EFBFBD><C882>ꍇ<EFBFBD>A7-Zip<69>v<EFBFBD><76><EFBFBD>O<EFBFBD>C<EFBFBD><43><EFBFBD>C<EFBFBD><43><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD>g<EFBFBD>p
<EFBFBD><EFBFBD><EFBFBD>邱<EFBFBD>ƂŃA<EFBFBD>[<5B>J<EFBFBD>C<EFBFBD>u<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>T<EFBFBD>|<7C>[<5B>g<EFBFBD><67><EFBFBD>”\<5C>ɂ<EFBFBD><C982>邽<EFBFBD>߂ɕK<C995>v<EFBFBD>ȃt<C883>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>C<EFBFBD><43><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><>
<EFBFBD>ł<EFBFBD><EFBFBD>܂<EFBFBD><EFBFBD>B<EFBFBD>ڍׂɂ‚<EFBFBD><EFBFBD>ẮA<EFBFBD>w<EFBFBD><EFBFBD><EFBFBD>v<EFBFBD>g<EFBFBD>s<EFBFBD>b<EFBFBD>N<EFBFBD>́u7-Zip<69>ƃA<C683>[<5B>J<EFBFBD>C<EFBFBD>u<EFBFBD>T<EFBFBD>|<7C>[<5B>g<EFBFBD>v<EFBFBD><76><EFBFBD>Q<EFBFBD>Ƃ<EFBFBD><C682>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B
<EFBFBD>T<EFBFBD>|<7C>[<5B>g
================
WinMerge<EFBFBD>Ɋւ<EFBFBD><EFBFBD>鎿<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă͂<EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>? http://forums.winmerge.org/
<EFBFBD>̌f<EFBFBD><EFBFBD><EFBFBD>‚<EFBFBD><EFBFBD>n<EFBFBD>߂<EFBFBD><EFBFBD>̂ɂ悢<EFBFBD>ꏊ<EFBFBD>ł<EFBFBD><EFBFBD>B
<EFBFBD>J<EFBFBD><EFBFBD><EFBFBD>҂͗<EFBFBD><EFBFBD><EFBFBD><EFBFBD>̃t<EFBFBD>H<EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD>ŕp<C595>ɂɓǂ݁A<DD81><41><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD><DC82>B
<EFBFBD>g<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ɋւ<EFBFBD><EFBFBD>鎿<EFBFBD><EFBFBD><EFBFBD>̂悤<EFBFBD>Ȉ<EFBFBD><EFBFBD>ʓI<EFBFBD>Ȏ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȃ<EFBFBD><EFBFBD><EFBFBD> Open Discussion forum<75><6D><EFBFBD>g<EFBFBD>p<EFBFBD><70><EFBFBD>A
<EFBFBD>J<EFBFBD><EFBFBD><EFBFBD>Ɋւ<EFBFBD><EFBFBD>邱<EFBFBD>Ƃł<EFBFBD><EFBFBD><EFBFBD><EFBFBD>΁ADevelpers forum<75><6D><EFBFBD>g<EFBFBD>p<EFBFBD><70><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B
<EFBFBD>o<EFBFBD>O<EFBFBD>񍐂Ƌ@<40>\<5C>lj<EFBFBD><C789>v<EFBFBD><76>:
=========================
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>AWinMerge<EFBFBD>̃t<EFBFBD>H<EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD>Ŗ<EFBFBD><C596>肪<EFBFBD><E882AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȃ<EFBFBD><C882>ꍇ<EFBFBD>A<EFBFBD>v<EFBFBD><76><EFBFBD>W<EFBFBD>F<EFBFBD>N<EFBFBD>g<EFBFBD>̃g<CC83><67><EFBFBD>b<EFBFBD>J<EFBFBD>[<5B><>
<EFBFBD>`<60>F<EFBFBD>b<EFBFBD>N<EFBFBD><4E><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Bhttp://project.winmerge.org/<2F>ɍs<C98D><73><EFBFBD>ABugs<67><73>Feature Requests
<EFBFBD>̂悤<EFBFBD><EFBFBD>Tracker<EFBFBD><EFBFBD><EFBFBD>j<EFBFBD><EFBFBD><EFBFBD>[<5B>̃<EFBFBD><CC83><EFBFBD><EFBFBD>N<EFBFBD><4E><EFBFBD>N<EFBFBD><4E><EFBFBD>b<EFBFBD>N<EFBFBD><4E><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B<EFBFBD><42><EFBFBD><EFBFBD><EFBFBD>ŁA<C581>{<7B><><EFBFBD>ƕ񍐂<C695><F18D9082>ł<EFBFBD><C582>܂<EFBFBD><DC82>B
<EFBFBD>o<EFBFBD>O<EFBFBD><EFBFBD><EFBFBD>񍐂<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƃ<EFBFBD><EFBFBD>AWinMerge<EFBFBD>̃o<EFBFBD>[<5B>W<EFBFBD><57><EFBFBD><EFBFBD><EFBFBD>ԍ<EFBFBD><D48D><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B
WinMerge<EFBFBD><EFBFBD>[<5B>w<EFBFBD><77><EFBFBD>v]<5D><><EFBFBD>j<EFBFBD><6A><EFBFBD>[<5B><>[<5B>ݒ<EFBFBD>]<5D><><EFBFBD><EFBFBD>'<27>R<EFBFBD><52><EFBFBD>t<EFBFBD>B<EFBFBD>O<EFBFBD><4F><EFBFBD>O'<27><><EFBFBD>o<EFBFBD>͂<EFBFBD><CD82>邱<EFBFBD>Ƃ<EFBFBD><C682>ł<EFBFBD><C582>܂<EFBFBD><DC82>B
<EFBFBD><EFBFBD><EFBFBD>̏<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>Ƃ<EFBFBD><C682>ēY<C493>t<EFBFBD><74><EFBFBD>āA<C481><41><EFBFBD>|<7C>[<5B>g<EFBFBD><67><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͊J<EFBFBD><EFBFBD><EFBFBD>҂ɂƂ<EFBFBD><EFBFBD>Ė<EFBFBD><EFBFBD>ɗ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ł<EFBFBD><EFBFBD>B
- WinMerge <20>J<EFBFBD><4A><EFBFBD>`<60>[<5B><>

64
WinMergePortable/App/WinMerge/Docs/ReadMe-Romanian.txt Normal file
View File

@@ -0,0 +1,64 @@
WINMERGE
WinMerge este un utilitar cu Sursă Deschisă de comparare şi fuziune
de fişiere care rulează pe toate versiunile moderne ale sistemului
de operare Windows. Unele funcţionalităţi necesită instalarea de
componente adiţionale.
Ultima versiune de WinMerge şi alte informaţii despre WinMerge sunt
disponibile la
http://winmerge.org
Start rapid către utilizarea WinMerge:
Citiţi capitolul Quick-start din manualul on-line pentru a vă
familiariza cu WinMerge:
http://manual.winmerge.org/QuickStart.html
Manualul HTML:
Manualul este disponibil la
http://manual.winmerge.org/
este posibil să-l aveţi instalat (dacă s-a optat pentru aceasta) local,
dar este şi copiabil separat de la http://winmerge.org/
(vezi documentaţia)
Suport arhivare:
WinMerge foloseşte 7-Zip pentru a suporta accesul la arhive de fişiere.
7-Zip (http://www.7-zip.org) este o unealtă de arhivare cu Sursă Deschisă.
Pentru a instala suportul de arhivare, copiaţi kit-ul plug-in-ului 7-Zip
de la http://winmerge.org/ .
Instalarea suportului de arhivare:
Este recomandat să instalaţi aplicaţia 7-Zip. Dacă acest lucru nu poate fi
făcut din oarecare motiv, instalatorul plug-in-ului 7-Zip poate instala
doar fişierele necesare pentru activarea suportului de instalare. Luaţi notă
că acest lucru NU va permite funcţionarea de sine stătătoare a lui 7-Zip, ci
doar suportul de arhivare pentru WinMerge.
Suportul pentru scripturi:
Dacă doriţi să lucraţi cu scripturi aveţi nevoie ca Windows Scripting Host
să fie instalat. Dacă observaţi erori care au ca sursă scripturile, vizitaţi
http://msdn.microsoft.com/library/default.asp?url=/downloads/list/webdev.asp
şi verificaţi daca Windows Scripting Host este la zi şi funcţionabil.
Suport:
Dezvoltatorii răspund la întrebări pe forumul WinMerge de la Sourceforge.net:
http://sourceforge.net/forum/?group_id=13216
Defecte şi solicitarea de noi funcţionalităţi:
Defectele şi solicitarea de noi funcţionalităţi trebuie înregistrate pe
listele de Defecte (Bugs) şi Funcţionalităţi (RFE) de la sourceforge.net.
Lista de defecte:
http://sourceforge.net/tracker/?group_id=13216&atid=113216
Atunci când înregistraţi un defect, vă rugăm să ne spuneţi versiunea de
WinMerge pe care o folosiţi! WinMerge versiunea 2.2.0 sau mai noi pot
scrie configurarea sub care rulează într-un fişier.
Această comandă este accesibilă din meniul Ajutor/Configurare.
Vă rugăm să ataşaţi şi această informaţie (ca un ataşament) la raportarea
dumneavoastră, conţine informaţii pentru dezvoltatori.
Lista pentru înregistratea de solicitări de noi funcţionalităţi (RFE):
http://sourceforge.net/tracker/?group_id=13216&atid=363216
- Dezvoltatorii WinMerge

60
WinMergePortable/App/WinMerge/Docs/ReadMe-Serbian.txt Normal file
View File

@@ -0,0 +1,60 @@
WINMERGE
WinMerge <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> Windows '<27><>/. WinMerge <20><><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
WinMerge <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
WinMerge <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,
<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>. <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>
<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> WinMerge <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> WinMerge <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><>
http://winmerge.org/.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
===========
<EFBFBD><EFBFBD> <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> WinMerge, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>
'<27><><EFBFBD><EFBFBD><EFBFBD>' <20> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> Quick start <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
http://manual.winmerge.org/QuickStart.html.
WinMerge <20><><EFBFBD><EFBFBD><EFBFBD>
=============
WinMerge <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> Microsoft HTML Help <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> WinMerge.chm,
<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> WinMerge. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> >WinMerge Help <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> F1 <20>
WinMerge <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> /? help switch.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> WinMerge Help <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
http://manual.winmerge.org/.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
===============
WinMerge <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 7-Zip (http://www.7-zip.org) <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 7-Zip <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
http://winmerge.org/downloads/.
<EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 7-Zip <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 7-zip
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>r <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, "7-Zip and archive support".
WinMerge <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
================
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> WinMerge? <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> the WinMerge
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> http://forums.winmerge.org/. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Open Discussion <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> WinMerge <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>'
<EFBFBD><EFBFBD> WinMerge <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
=========================
<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> WinMerge <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,<2C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>
http://project.winmerge.org/, <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>
'<27><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>', <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..
<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> WinMerge <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>><3E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
- The WinMerge <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

59
WinMergePortable/App/WinMerge/Docs/ReadMe-Spanish.txt Normal file
View File

@@ -0,0 +1,59 @@
WINMERGE
WinMerge es una utilidad de codigo abierto para la comparaci<63>n y combinaci<63>n
de ficheros, ejecutable en todas las versiones modernas de Windows. Algunas
caracter<EFBFBD>sticas requieren la instalaci<63>n de componentes adicionales.
La <20>ltima versi<73>n de WinMerge e informaci<63>n adicional est<73>n disponibles en
http://winmerge.org
Gu<EFBFBD>a r<>pida de WinMerge:
Lea el cap<61>tulo Quick-start del manual on-line para comenzar con WinMerge;
http://manual.winmerge.org/QuickStart.html
Manual HTML:
el manual est<73> disponible online en:
http://manual.winmerge.org/
Posiblemente tambi<62>n est<73> instalado (si se eligi<67> as<61>) localmente, y se puede
descargar por separado desde http://winmerge.org/ (ver Documentaci<63>n)
Soporte de archivado:
WinMerge usa 7-Zip para soporte de archivado. 7-Zip (http://www.7-zip.org)
es una utilidad de c<>digo abierto de compresi<73>n. Para instalar el soporte de
archivado, descargue el instalador del plugin de 7-Zip desde
http://winmerge.org/.
Instalaci<EFBFBD>n del soporte de archivado:
Se recomienda instalar la aplicaci<63>n 7-Zip. Si no pudiera ser por alguna raz<61>n,
el instalador del plugin de 7-Zip puede instalar <20>nicamente los archivos
necesarios para habilitar el soporte de archivado. Tenga en cuenta que esto no
permite el uso en solitario de 7-Zip, sino que solo habilita el soporte de
archivado de WinMerge.
Soporte de Scripts:
Si desea trabajar con scripts necesitar<61> tener Windows Scripting Host instalado.
Si recibe cualquier error relacionado con sus scripts, por favor visite
http://msdn.microsoft.com/library/default.asp?url=/downloads/list/webdev.asp
para comprobar que el Scripting Host est<73> actualizado y no corrupto.
Soporte:
Los desarrolladores contestan consultas en los foros WinMerge de SourceForge.net:
http://sourceforge.net/forum/?group_id=13216
Errores y solicitud de nuevas caracter<65>sticas:
Los errores y peticiones de nuevas opciones deben ser enviados a las listas de
errores y peticiones (RFE) de sourceforge.net
Lista de errores (Bug tracker):
http://sourceforge.net/tracker/?group_id=13216&atid=113216
Al reportar un error por favor indique la versi<73>n de WinMerge.
A partir de la versi<73>n 2.2.0, WinMerge puede extraer un resumen de configuraci<63>n
a traves del men<65> Ayuda/Configuraci<63>n. Por favor, anexe este fichero al
informe de error, ya que contiene mucha informaci<63>n de utilidad para los
desarrolladores.
Lista de peticiones (RFE tracker):
http://sourceforge.net/tracker/?group_id=13216&atid=363216
- El equipo de desarrollo de WinMerge

68
WinMergePortable/App/WinMerge/Docs/ReadMe-Swedish.txt Normal file
View File

@@ -0,0 +1,68 @@
WINMERGE
WinMerge <20>r ett Open Source j<>mf<6D>r- och sammanslagningsverktyg f<>r Windows.
WinMerge kan j<>mf<6D>ra b<>de kataloger och filer visande skillnader i ett visuellt
textformat,som <20>r enkelt att f<>rst<73> och hantera. WinMerge kan anv<6E>ndas som ett
externt skillnads/sammanslagnings-verktyg eller som en sj<73>lvst<73>ndig applikation.
WinMerge har m<>nga hj<68>lpsamma st<73>dfunktioner f<>r att g<>ra j<>mf<6D>relser,
synkroniseringar och sammanslagningar s<> l<>tt och anv<6E>ndbart som m<>jligt.
Flera programmeringsspr<70>k och andra filformat <20>r syntax-markerade.
Den senaste WinMerge-versionen och WinMerge-information finns tillg<6C>nglig p<>
http://winmerge.org/.
Quick start (Snabbstart)
===========
F<EFBFBD>r att l<>ra sig hur man ska utf<74>ra grundl<64>ggande uppgifter efter att ha
installerat WinMerge, klicka p<> "Hj<48>lp>WinMerge Hj<48>lp")
och navigera till "Quick start"-<2D>mnet. Eller, g<> till Internetversionen p<>
http://manual.winmerge.org/QuickStart.html.
WinMerge Help (WinMerges Hj<48>lp)
=============
WinMerges Hj<48>lp <20>r installerat lokalt som en Microsoft HTML-hj<68>lpfil,
WinMerge.chm,n<>r du installerar WinMerge. F<>r att <20>ppna Hj<48>lpen, klicka p<>
"Hj<48>lp>WinMerge Hj<48>lp" eller tryck p<> F1 i WinMerges f<>nster. P<> kommandoraden,
k<EFBFBD>r WinMerge-programmet med /? hj<68>lpparametern.
Du kan ocks<6B> bl<62>ddra i HTML-versionen av WinMerges Hj<48>lp p<>
http://manual.winmerge.org/.
Archive Support (Arkivsupport)
===============
WinMerge anv<6E>nder 7-Zip (http://www.7-zip.org) Open Source arkivverktyget f<>r
arkivfilst<EFBFBD>d. Vi rekommenderar att 7-zip applikationen installeras genom att
ladda ner och k<>ra 7-Zip plugininstallationsprogrammet p<>
http://winmerge.org/downloads/.
Om du inte av n<>gon anledning kan installera 7-Zip-verktyget kan du anv<6E>nda
7-zips plugin-installationsprogram f<>r att installera bara de filer som kr<6B>vs
f<EFBFBD>r arkivfilst<73>d. Se Hj<48>lp<6C>mnet, "7-Zip and archive support"
("7-zip och arkivst<73>d") f<>r detaljer.
WinMerge Support (WinMerge-support)
================
Fr<EFBFBD>gor eller synpunkter om WinMerge? Ett bra st<73>lle att starta p<> <20>r WinMerges
samh<EFBFBD>llsbulletinboard p<> http://forums.winmerge.org/. Utvecklare l<>ser ofta
och svarar p<> fr<66>gor i b<>da forumen. Anv<6E>nd "Open Discussion forum"
("<22>ppet Diskussionsforum") f<>r generella WinMerge<67>mnen, som fr<66>gor om
anv<EFBFBD>ndning. Anv<6E>nd "Developers forum" ("Utvecklarforum")
f<EFBFBD>r WinMerge utvecklings<67>mnen.
Bugs and feature requests (Buggar och funktions<6E>skanden)
=========================
Om ett <20>mne inte l<>ses i WinMerges forum, kontrollera i "Project trackers"
("Projektsp<73>rarna"): g<> till http://project.winmerge.org/, och klicka p<> en l<>nk
i "Tracker menu" ("Sp<53>rmenyn"), som "Bugs and Feature Requests"
("Buggar och funktions<6E>skanden"), d<>r du kan bl<62>ddra i eller skicka <20>mnen.
Om du skickar en felrapport, var god och inkludera WinMerge-versionsnumret i din
felrapport. Du kan generera en konfigurationslogg genom att klicka p<>
"Hj<48>lp>Konfiguration".
Var god och bifoga konfigurationsloggen till felrapporten; den har mycket
anv<EFBFBD>ndbar information f<>r utvecklare.
- WinMerges Utvecklare

36
WinMergePortable/App/WinMerge/Docs/ReadMe-Turkish.txt Normal file
View File

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

58
WinMergePortable/App/WinMerge/Docs/ReadMe-Ukrainian.txt Normal file
View File

@@ -0,0 +1,58 @@
WINMERGE
WinMerge <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Open Source) <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><>'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Windows. <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> WinMerge <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> WinMerge <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
http://winmerge.org
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> WinMerge:
<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> WinMerge:
http://manual.winmerge.org/QuickStart.html
HTML-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
http://manual.winmerge.org/
<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>) <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>
http://winmerge.org/ (<28><><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
ϳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> WinMerge <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 7-Zip. 7-Zip
(http://www.7-zip.org) <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Open Source) <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 7-Zip <20>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> http://winmerge.org/
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 7-Zip. <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,
<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 7-zip <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
7-Zip <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> WinMerge.
ϳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Windows Scripting Host. <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
http://msdn.microsoft.com/library/default.asp?url=/downloads/list/webdev.asp
<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD> Scripting Host <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
ϳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> WinMerge <20><> Sourceforge.net:
http://sourceforge.net/forum/?group_id=13216
<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
RFE <20><> <20>ള<EFBFBD> <20><> sourceforge.net.
³<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ള<EFBFBD>:
http://sourceforge.net/tracker/?group_id=13216&atid=113216
<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> WinMerge!
WinMerge <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 2.2.0 <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" <20> <20><><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> -> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><> <20><><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>) <20><>
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD>, <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
³<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> RFE (<28><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>):
http://sourceforge.net/tracker/?group_id=13216&atid=363216
- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> WinMerge

62
WinMergePortable/App/WinMerge/Docs/ReadMe.txt Normal file
View File

@@ -0,0 +1,62 @@
WINMERGE
WinMerge is an Open Source comparing and merging tool for Windows. WinMerge can
compare both folders and files, presenting differences in a visual text format
that is easy to understand and handle. WinMerge can be used as an external
differencing/merging tool or as a standalone application.
WinMerge has many helpful supporting features to make comparing, synchronising,
and merging as easy and useful as possible. Several programming languages and
other file formats are syntax-highlighted.
The latest WinMerge version and WinMerge information is available at
http://winmerge.org/.
Quick start
===========
To learn how to perform basic operations after installing WinMerge, click
Help>WinMerge Help and navigate to the Quick start topic. Or, go to the Web
version at http://manual.winmerge.org/QuickStart.html.
WinMerge Help
=============
WinMerge Help is installed locally as a Microsoft HTML Help file, WinMerge.chm,
when you install WinMerge. To open Help, click Help>WinMerge Help or press F1 in
the WinMerge window. On the command line, run the WinMerge executable with the
/? help switch.
You can also browse the HTML version of WinMerge Help at
http://manual.winmerge.org/.
Archive Support
===============
WinMerge uses the 7-Zip (http://www.7-zip.org) Open Source archive tool for
archive file support. We recommended installing the 7-Zip application by
downloading and running the 7-Zip plugin installer from
http://winmerge.org/downloads/.
If you cannot install the 7-Zip tool for any reason, you can use the 7-zip
plugin installer to install only the files required for archive file
support. See the Help topic, "7-Zip and archive support" for details.
WinMerge Support
================
Questions or suggestions about WinMerge? A good place to start is the WinMerge
community bulletin board at http://forums.winmerge.org/. Developers frequently
read and respond to questions in both forums. Use the Open Discussion forum for
general WinMerge issues, such as questions about usage. Use the Developers forum
for WinMerge development issues.
Bugs and feature requests
=========================
If an issue is not resolved in the the WinMerge forums, check the project
trackers: go to http://project.winmerge.org/, and click a link in the Trackers
menu, like Bugs and Feature Requests, where you can browse or submit items.
If you submit a bug, please include the WinMerge version number in your
report. You can generate a configuration log by clicking Help>Configuration.
Please attach the configuration log to the bug report; it has lots of useful
information for developers.
- The WinMerge Developers

250
WinMergePortable/App/WinMerge/Docs/ReleaseNotes.html Normal file
View File

@@ -0,0 +1,250 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<!-- $Id: ReleaseNotes.html 7587 2013-01-14 02:25:43Z christianlist $ -->
<html>
<head>
<title>Release Notes</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<style type="text/css">
<!--
body {
font-family: Verdana,Helvetica,Arial,sans-serif;
font-size: small;
}
code,pre {
font-family: "Courier New",Courier,monospace;
font-size: 1em;
}
h3 {
padding: 2px;
border-left: 4px solid #FFCC00;
border-bottom: 1px solid #FFCC00;
}
h4 {
padding: 2px;
border-left: 8px solid #FF9933;
border-bottom: 1px solid #FF9933;
}
h5 {
font-size: small;
}
pre {
margin-left: 25px;
margin-right: 25px;
padding: 5px;
background-color: #EEEEEE;
border: 1px solid black;
}
p.note {
padding: 5px;
background-color: #DDDDFF;
border: 1px solid blue;
}
acronym {
cursor: help;
border-bottom: 1px dotted black;
}
-->
</style>
</head>
<body>
<h2>WinMerge 2.14.0 Release Notes</h2>
<ul>
<li><a href="#about">About This Release</a></li>
<li><a href="#new2140">What Is New in 2.14.0?</a></li>
<li><a href="#new21320">What Is New in 2.13.20 beta?</a></li>
<li><a href="#issues">Known Issues</a></li>
</ul>
<p>June 2011</p>
<h3><a name="about">About This Release</a></h3>
<p>
This is a WinMerge 2.14.0 stable release. This release replaces earlier WinMerge
stable releases as a recommended release.
</p>
<p>
Please submit bug reports to our <a href="http://bugs.winmerge.org">bug-tracker</a>.
</p>
<h3><a name="#new2140">What Is New in 2.14.0?</a></h3>
<p>
WinMerge 2.14 is an important update to WinMerge. There are lots of
improvements and bug fixes since 2.12.4 stable release.
</p>
<p>2.14.0 stable release has many changes after beta release. But see also the
2.13 beta release changes below for other important changes in this release.
</p>
<h4>Improvements</h4>
<ul>
<li>Improve startup time</li>
<li>Improve editing of linefilter regular expressions</li>
<li>Improve color options organization</li>
</ul>
<h4>Other changes</h4>
<ul>
<li>Update PCRE to version 8.10</li>
<li>Update SCEW to version 1.1.2</li>
<li>Add menuitems for selecting automatic or manual prediffing</li>
<li>Add accelerator keys for Shell context menu</li>
<li>Allow editing context line count in patch creator</li>
<li>Add <code>/xq</code> command line switch for closing WinMerge after identical files and not showing message</li>
<li>Allow setting codepage from command line</li>
<li>Allow giving encoding name as custom codepage</li>
<li>Add new options dialog panel for folder compare options</li>
<li>Add options GUI for quick compare limit</li>
<li>Write config log as UTF-8 file</li>
</ul>
<h4>Bugs fixed</h4>
<ul>
<li>Untranslated string ("Merge.rc:nnnn") was displayed in status bar</li>
<li>Pane headers not updated after language change</li>
<li>Quick contents compare didn't ignore EOL byte differences</li>
<li>Compare by size always checked file times too</li>
<li>Crash when pasting from clipboard</li>
<li>Keeps verifing path even turned off in options</li>
<li>Crash after deleting text</li>
<li>Added EOL chars between copied file/path names</li>
<li>Created new matching folder to wrong folder</li>
<li>Strange scrolling effect in location pane</li>
<li>Plugin error after interrupting folder compare</li>
<li>"+" and "-" from the number block don't work in the editor</li>
<li>Date format did not respect Regional Settings</li>
</ul>
<h4>New Translation</h4>
<ul>
<li>Basque</li>
</ul>
<h4>Translation updates</h4>
<ul>
<li>Hungarian</li>
<li>Turkish</li>
<li>Russian</li>
<li>Norwegian</li>
<li>Danish</li>
</ul>
<h3><a name="new21320">What Is New in 2.13.20 beta?</a></h3>
<p>
WinMerge before version 2.13.20 was vulnerable to DLL hijacking as described in
Microsoft Security Advisory (<a href="http://www.microsoft.com/technet/security/advisory/2269637.mspx">2269637</a>).
To fix this problem, we must also drop support for Windows 9x, ME and NT4.
</p>
<h4>Installer</h4>
<ul>
<li>Drop Windows 9x/ME/NT4 support and use Microsoft runtime libraries installer</li>
<li>Remove Uninstall shortcut from start menu folder</li>
<li>Don't install quick launch icon for Windows 7</li>
</ul>
<h4>Other changes</h4>
<ul>
<li>Add missing keywords to Pascal highlighter</li>
<li>Recognize .ascx files as ASP files</li>
<li>Fix help locations</li>
<li>Show only "Copy to other side" item in file compare context menu</li>
<li>Expand/collapse folders from keyboard</li>
<li>Improve detecting XML files in file compare</li>
<li>Initialize folder selection dialog to currently selected folder in options dialog</li>
</ul>
<h4>Bugs fixed</h4>
<ul>
<li>WinMerge was vulnerable to DLL hijacking as described in Microsoft Security
Advisory (<a href="http://www.microsoft.com/technet/security/advisory/2269637.mspx">2269637</a>)</li>
<li>Location pane focus enabled "Save"</li>
<li>"Copy and advance" toolbar icons not automatically enabled</li>
</ul>
<h4>New Translations</h4>
<ul>
<li>Persian</li>
<li>Serbian</li>
</ul>
<h4>Translation updates</h4>
<ul>
<li>Bulgarian</li>
<li>Chinese</li>
<li>Dutch</li>
<li>French</li>
<li>Slovenian</li>
<li>Spanish</li>
<li>Turkish</li>
<li>Ukrainian</li>
</ul>
<h3><a name="issues">Known Issues</a></h3>
<ul>
<li>
<p><strong>7-zip installed from MSI installer may not work with WinMerge.</strong></p>
<p><i>Workaround</i>: Use the EXE installer of 7-Zip. See manual
<i>4.5. 7-Zip and Archive Support</i> for more information.</p>
</li>
<li>
<p><strong>Old IE version can cause crashes when handling archive files.</strong></p>
<p><i>Workaround</i>: If WinMerge crashes when handling archives, consider
updating IE to version 6.0 or later.</p>
</li>
<li>
<p><strong>Supercopier application causes WinMerge to hang.</strong></p>
<p><a href="http://supercopier.sfxteam.org/modules/mydownloads/">Supercopier</a>
application causes WinMerge to not exit properly and leaves WinMerge process
hang. See the bug reports:
<ul>
<li><a href="http://winmerge.org/bug/1976241">#1976241</a> the winmerge.exe
process doesn't stop itself</li>
<li><a href="http://winmerge.org/bug/1602313">#1602313</a> WinMerge stays
in tasklist after closing</li>
</ul>
<p><i>Workaround</i>: Disable the Supercopier when using WinMerge.</p>
</li>
<li>
<p><strong>There is no way to specify the codepage for a particular file.</strong></p>
<p><i>Workaround</i>: Specify the default codepages for all files in Edit-&gt;Options-&gt;Codepage-&gt;Custom codepage.</p>
</li>
<li><p><strong>There is no 3-way merge.</strong> <small><a href="http://winmerge.org/rfe/990464" title="Feature Request #990464">#990464</a></small></p></li>
<li>
<p><strong>Filters only applied when using full compare.</strong></p>
<p>Line filtering is only applied in folder compare when using <i>Full Contents</i>-compare method.</p>
<p>If you are using any other compare method, line filters are not applied. Files marked different
in folder compare can get status changed to identical when opening them to file compare.</p>
</li>
<li>
<p><strong>Some plugins shipped with WinMerge require Visual Basic runtime library to work</strong></p>
<p><i>Workaround</i>: You can download the required file <code><a href="http://www.dll-files.com/dllindex/dll-files.shtml?msvbvm60">msvbvm60.dll</a></code>
or use the <a href="http://www.microsoft.com/downloads/details.aspx?familyid=7b9ba261-7a9c-43e7-9117-f673077ffb3c">Run-Time Redistribution Pack</a> from Microsoft.</p>
<p><i>Workaround 2</i>: If you don't need the plugin, you can safely remove it.</p>
</li>
<li>
<p><strong>VSS integration cannot add new files to VSS</strong></p>
<p>If you need to add a new file, you must add it via VSS client program.</p>
</li>
<li>
<p><strong>Unset WinMerge integration from ClearCase</strong></p>
<p>To remove WinMerge integration, you'll need to edit one file by hand:</p>
<ol>
<li>Find ClearCase installation folder<br>
Usually it is something like <code>C:\Program Files\Rational\ClearCase</code></li>
<li>Go to subfolder <code>lib\mgrs\</code></li>
<li>Open file <code>map</code> in there to editor program</li>
<li>Comment-out the line starting with "<code>text_file_delta xcompare</code>", containing "<code>WinMergeU.exe</code>"</li>
<li>Uncomment the line starting with "<code>text_file_delta xcompare</code>", containing "<code>cleardiffmrg.exe</code>"</li>
</ol>
</li>
</ul>
</body>
</html>

BIN
WinMergePortable/App/WinMerge/Docs/WinMerge.chm Normal file
View File

Binary file not shown.