You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(148) |
Oct
(84) |
Nov
(130) |
Dec
(121) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(89) |
Feb
(50) |
Mar
(81) |
Apr
(45) |
May
(42) |
Jun
(46) |
Jul
(40) |
Aug
(98) |
Sep
(80) |
Oct
(101) |
Nov
(128) |
Dec
(46) |
| 2008 |
Jan
(132) |
Feb
(117) |
Mar
(118) |
Apr
(112) |
May
(69) |
Jun
(140) |
Jul
(164) |
Aug
(159) |
Sep
(115) |
Oct
(65) |
Nov
(80) |
Dec
(128) |
| 2009 |
Jan
(145) |
Feb
(97) |
Mar
(118) |
Apr
(87) |
May
(96) |
Jun
(83) |
Jul
(50) |
Aug
(42) |
Sep
(18) |
Oct
(32) |
Nov
(12) |
Dec
(35) |
| 2010 |
Jan
(38) |
Feb
(8) |
Mar
(5) |
Apr
(19) |
May
(23) |
Jun
(39) |
Jul
(16) |
Aug
(4) |
Sep
(60) |
Oct
(100) |
Nov
(57) |
Dec
(43) |
| 2011 |
Jan
(25) |
Feb
(1) |
Mar
(3) |
Apr
|
May
(13) |
Jun
(19) |
Jul
|
Aug
(6) |
Sep
(5) |
Oct
(6) |
Nov
|
Dec
(1) |
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ki...@us...> - 2010-04-28 17:28:10
|
Revision: 7143
http://winmerge.svn.sourceforge.net/winmerge/?rev=7143&view=rev
Author: kimmov
Date: 2010-04-28 17:28:04 +0000 (Wed, 28 Apr 2010)
Log Message:
-----------
Remove Web folders as we now have separate Mercurial repository for web pages.
Modified Paths:
--------------
trunk/Docs/Developers/SVN_Organisation.txt
Removed Paths:
-------------
trunk/Translations/Web/
trunk/Web/
Modified: trunk/Docs/Developers/SVN_Organisation.txt
===================================================================
--- trunk/Docs/Developers/SVN_Organisation.txt 2010-04-28 17:05:50 UTC (rev 7142)
+++ trunk/Docs/Developers/SVN_Organisation.txt 2010-04-28 17:28:04 UTC (rev 7143)
@@ -45,9 +45,7 @@
- InnoSetup
- ShellExtension
- WinMerge
- - Web
-
WinMerge/ArchiveSupport/
- Archive file support system. Currently includes 7-Zip based archive support.
@@ -175,6 +173,3 @@
WinMerge/Translations/WinMerge
- WinMerge executable translations
-
-WinMerge/Web/
- - Homepages.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-04-28 17:05:56
|
Revision: 7142
http://winmerge.svn.sourceforge.net/winmerge/?rev=7142&view=rev
Author: kimmov
Date: 2010-04-28 17:05:50 +0000 (Wed, 28 Apr 2010)
Log Message:
-----------
PATCH: #2774357 EOL_MIXED
Submitted by Matthias Mayer
Modified Paths:
--------------
trunk/Src/DiffTextBuffer.cpp
trunk/Src/MergeEditView.cpp
trunk/Src/editlib/ccrystaltextbuffer.cpp
trunk/Src/editlib/ccrystaltextbuffer.h
trunk/Src/editlib/ccrystaltextview.cpp
Modified: trunk/Src/DiffTextBuffer.cpp
===================================================================
--- trunk/Src/DiffTextBuffer.cpp 2010-04-28 16:11:09 UTC (rev 7141)
+++ trunk/Src/DiffTextBuffer.cpp 2010-04-28 17:05:50 UTC (rev 7142)
@@ -43,9 +43,12 @@
static bool IsTextFileStylePure(const UniMemFile::txtstats & stats)
{
int nType = 0;
- nType += (stats.ncrlfs > 0);
- nType += (stats.ncrs > 0);
- nType += (stats.nlfs > 0);
+ if (stats.ncrlfs > 0)
+ nType++;
+ if ( stats.ncrs > 0)
+ nType++;
+ if (stats.nlfs > 0)
+ nType++;
return (nType <= 1);
}
@@ -139,7 +142,10 @@
*/
static CRLFSTYLE GetTextFileStyle(const UniMemFile::txtstats & stats)
{
- if (stats.ncrlfs >= stats.nlfs)
+ // Check if file has more than one EOL type.
+ if (!IsTextFileStylePure(stats))
+ return CRLF_STYLE_MIXED;
+ else if (stats.ncrlfs >= stats.nlfs)
{
if (stats.ncrlfs >= stats.ncrs)
return CRLF_STYLE_DOS;
@@ -466,7 +472,7 @@
{
nCrlfStyle = GetTextFileStyle(pufile->GetTxtStats());
}
- ASSERT(nCrlfStyle >= 0 && nCrlfStyle <= 2);
+ ASSERT(nCrlfStyle >= 0 && nCrlfStyle <= 3);
SetCRLFMode(nCrlfStyle);
// At least one empty line must present
@@ -545,7 +551,7 @@
{
// get the default nCrlfStyle of the CDiffTextBuffer
nCrlfStyle = GetCRLFMode();
- ASSERT(nCrlfStyle >= 0 && nCrlfStyle <= 2);
+ ASSERT(nCrlfStyle >= 0 && nCrlfStyle <= 3);
}
BOOL bOpenSuccess = TRUE;
@@ -618,7 +624,7 @@
}
// normal real line : append an EOL
- if (nCrlfStyle == CRLF_STYLE_AUTOMATIC)
+ if (nCrlfStyle == CRLF_STYLE_AUTOMATIC || nCrlfStyle == CRLF_STYLE_MIXED)
{
// either the EOL of the line (when preserve original EOL chars is on)
sLine += GetLineEol(line);
Modified: trunk/Src/MergeEditView.cpp
===================================================================
--- trunk/Src/MergeEditView.cpp 2010-04-28 16:11:09 UTC (rev 7141)
+++ trunk/Src/MergeEditView.cpp 2010-04-28 17:05:50 UTC (rev 7142)
@@ -2096,14 +2096,7 @@
*/
void CMergeEditView::OnUpdateStatusLeftEOL(CCmdUI* pCmdUI)
{
- if (GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL) ||
- GetDocument()->IsMixedEOL(0))
- {
- String eol = LoadResString(IDS_EOL_MIXED);
- pCmdUI->SetText(eol.c_str());
- }
- else
- GetDocument()->GetLeftView()->OnUpdateIndicatorCRLF(pCmdUI);
+ GetDocument()->GetLeftView()->OnUpdateIndicatorCRLF(pCmdUI);
}
/**
Modified: trunk/Src/editlib/ccrystaltextbuffer.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextbuffer.cpp 2010-04-28 16:11:09 UTC (rev 7141)
+++ trunk/Src/editlib/ccrystaltextbuffer.cpp 2010-04-28 17:05:50 UTC (rev 7142)
@@ -650,7 +650,8 @@
nCRLFMode = CRLF_STYLE_DOS;
m_nCRLFMode = nCRLFMode;
- ASSERT(m_nCRLFMode==CRLF_STYLE_DOS || m_nCRLFMode==CRLF_STYLE_UNIX || m_nCRLFMode==CRLF_STYLE_MAC);
+ ASSERT(m_nCRLFMode == CRLF_STYLE_DOS || m_nCRLFMode == CRLF_STYLE_UNIX ||
+ m_nCRLFMode == CRLF_STYLE_MAC || m_nCRLFMode == CRLF_STYLE_MIXED);
}
BOOL CCrystalTextBuffer::
@@ -1531,7 +1532,11 @@
m_aUndoBuf.push_back (ur);
m_nUndoPosition = (int) m_aUndoBuf.size ();
}
-
+/**
+ * @brief Get EOL style string.
+ * @param [in] nCRLFMode.
+ * @return string of CRLF style.
+ */
LPCTSTR CCrystalTextBuffer::GetStringEol(CRLFSTYLE nCRLFMode)
{
switch(nCRLFMode)
@@ -1539,6 +1544,7 @@
case CRLF_STYLE_DOS: return _T("\r\n");
case CRLF_STYLE_UNIX: return _T("\n");
case CRLF_STYLE_MAC: return _T("\r");
+ // If mixed or not defined
default: return _T("\r\n");
}
}
Modified: trunk/Src/editlib/ccrystaltextbuffer.h
===================================================================
--- trunk/Src/editlib/ccrystaltextbuffer.h 2010-04-28 16:11:09 UTC (rev 7141)
+++ trunk/Src/editlib/ccrystaltextbuffer.h 2010-04-28 17:05:50 UTC (rev 7142)
@@ -64,7 +64,9 @@
CRLF_STYLE_AUTOMATIC = -1,
CRLF_STYLE_DOS = 0,
CRLF_STYLE_UNIX = 1,
- CRLF_STYLE_MAC = 2
+ CRLF_STYLE_MAC = 2,
+ CRLF_STYLE_MIXED = 3
+
};
enum
Modified: trunk/Src/editlib/ccrystaltextview.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextview.cpp 2010-04-28 16:11:09 UTC (rev 7141)
+++ trunk/Src/editlib/ccrystaltextview.cpp 2010-04-28 17:05:50 UTC (rev 7142)
@@ -4386,6 +4386,11 @@
pCmdUI->SetText (eol.c_str());
pCmdUI->Enable (TRUE);
break;
+ case CRLF_STYLE_MIXED:
+ eol = LoadResString (IDS_EOL_MIXED);
+ pCmdUI->SetText (eol.c_str());
+ pCmdUI->Enable (TRUE);
+ break;
default:
pCmdUI->SetText (NULL);
pCmdUI->Enable (FALSE);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-04-28 16:11:19
|
Revision: 7141
http://winmerge.svn.sourceforge.net/winmerge/?rev=7141&view=rev
Author: kimmov
Date: 2010-04-28 16:11:09 +0000 (Wed, 28 Apr 2010)
Log Message:
-----------
PATCH: #2933033 No prediffer by menu
Submitted by Matthias Mayer
Modified Paths:
--------------
trunk/Src/MergeEditView.cpp
Modified: trunk/Src/MergeEditView.cpp
===================================================================
--- trunk/Src/MergeEditView.cpp 2010-04-27 19:44:53 UTC (rev 7140)
+++ trunk/Src/MergeEditView.cpp 2010-04-28 16:11:09 UTC (rev 7141)
@@ -2462,7 +2462,9 @@
}
/**
- * @brief Handler for all prediffer choices, including ID_PREDIFF_MANUAL, ID_PREDIFF_AUTO, ID_NO_PREDIFFER, & specific prediffers
+ * @brief Handler for all prediffer choices.
+ * Prediffer choises include ID_PREDIFF_MANUAL, ID_PREDIFF_AUTO,
+ * ID_NO_PREDIFFER, & specific prediffers.
*/
void CMergeEditView::SetPredifferByMenu(UINT nID )
{
@@ -2472,7 +2474,11 @@
if (nID == ID_NO_PREDIFFER)
{
m_CurrentPredifferID = nID;
- pd->SetPrediffer(NULL);
+ // All flags are set correctly during the construction
+ PrediffingInfo *infoPrediffer = new PrediffingInfo;
+ infoPrediffer->bToBeScanned = 0;
+ infoPrediffer->pluginName.clear();
+ pd->SetPrediffer(infoPrediffer);
pd->FlushAndRescan(true);
return;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-04-27 19:45:00
|
Revision: 7140
http://winmerge.svn.sourceforge.net/winmerge/?rev=7140&view=rev
Author: kimmov
Date: 2010-04-27 19:44:53 +0000 (Tue, 27 Apr 2010)
Log Message:
-----------
Update installer documentation.
Modified Paths:
--------------
trunk/Docs/Developers/readme-InnoSetup.html
Modified: trunk/Docs/Developers/readme-InnoSetup.html
===================================================================
--- trunk/Docs/Developers/readme-InnoSetup.html 2010-04-27 19:35:12 UTC (rev 7139)
+++ trunk/Docs/Developers/readme-InnoSetup.html 2010-04-27 19:44:53 UTC (rev 7140)
@@ -88,18 +88,17 @@
<a href="Translations.html">Translations.html</a>.</p>
<p>In addition you will need Microsoft C- and MFC-runtime files. Those files are
-not distributes with WinMerge. You get these files from Visual Studio
-installation folder or can download them from internet. By default we use VS2005
-runtime files:
-<ul>
- <li><code>msvcr80.dll</code></li>
- <li><code>msvcp80.dll</code></li>
- <li><code>mfc80.dll</code></li>
- <li><code>mfc80u.dll</code></li>
- <li><code>Microsoft.VC80.CRT.manifest</code></li>
- <li><code>Microsoft.VC80.MFC.manifest</code></li>
-</ul>
+not distributes with WinMerge. Older WinMerge installers copied those runtime
+files to WinMerge program folder. But with VS 2005 and later this has caused a
+lot of installing problems for users. So now we are embedding MS's own runtime
+installer executable to our installer. This makes the installer executable
+considerable bigger but seems to be the only reliable way to install those
+runtime files.</p>
+<p>You can download the latest VC2005 runtimes installer from MS:
+<a href="http://www.microsoft.com/downloads/details.aspx?familyid=766A6AF7-EC73-40FF-B072-9112BAB119C2&displaylang=en">
+http://www.microsoft.com/downloads/details.aspx?familyid=766A6AF7-EC73-40FF-B072-9112BAB119C2&displaylang=en</a><p>
+
<h4>Folder structure</h4>
<p>Copy or move the WinMerge files into the following layout (not runtimes):</p>
@@ -214,8 +213,8 @@
</pre>
<p>from <code>WinMerge.iss</code></p>
-<h4>Runtime files</h4>
-<p>Runtime files must be copied to the <code>Runtimes</code>-folder in same level
+<h4>Runtime files installer</h4>
+<p>Runtime files installer must be copied to the <code>Runtimes</code>-folder in same level
than WinMerge source tree folder is. Not <i>inside</i> source tree but
<i>outside</i> of the source tree.</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-04-27 19:35:18
|
Revision: 7139
http://winmerge.svn.sourceforge.net/winmerge/?rev=7139&view=rev
Author: kimmov
Date: 2010-04-27 19:35:12 +0000 (Tue, 27 Apr 2010)
Log Message:
-----------
Installer: Embed MS runtime files installer
Embed MS runtimes installer to our InnoSetup installer. This should solve
most installing problems users have had with our previous method of
installing all runtime files and manifest files one by one.
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-04-27 19:24:07 UTC (rev 7138)
+++ trunk/Docs/Users/ChangeLog.txt 2010-04-27 19:35:12 UTC (rev 7139)
@@ -5,6 +5,7 @@
WinMerge 2.13.12
Update copyright year to 2010
+ Installer: Embed MS runtime files installer(r7139)
Fix help locations (#2988974)
Bugfix: Strange scrolling effect in location pane (#2942869)
Bugfix: Difference panel didn't show differences when moved blocks were
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2010-04-27 19:24:07 UTC (rev 7138)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2010-04-27 19:35:12 UTC (rev 7139)
@@ -48,13 +48,8 @@
#define AppVersion GetFileVersion(SourcePath + "\..\..\Build\MergeUnicodeRelease\WinMergeU.exe")
#define FriendlyAppVersion Copy(GetFileVersion(SourcePath + "\..\..\Build\MergeUnicodeRelease\WinMergeU.exe"), 1, 5)
-; Runtime files
-#define Runtime_MFC "..\..\..\Runtimes\mfc80.dll"
-#define Runtime_MFCU "..\..\..\Runtimes\mfc80u.dll"
-#define Runtime_C "..\..\..\Runtimes\msvcr80.dll"
-#define Runtime_CPP "..\..\..\Runtimes\msvcp80.dll"
-#define Runtime_CPP_Manifest "..\..\..\Runtimes\Microsoft.VC80.CRT.manifest"
-#define Runtime_MFC_Manifest "..\..\..\Runtimes\Microsoft.VC80.MFC.manifest"
+; Runtime files installer
+#define RuntimesX86Installer "..\..\..\Runtimes\vcredist_x86.exe"
[Setup]
@@ -366,13 +361,8 @@
; List of installed files
Source: ..\..\Docs\Users\Files.txt; DestDir: {app}; Flags: promptifolder; Components: Core
-; Microsoft runtime libraries (C-runtime, MFC)
-Source: {#Runtime_MFC}; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; OnlyBelowVersion: 0, 4; Components: Core
-Source: {#Runtime_MFCU}; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; MinVersion: 0, 4; Components: Core
-Source: {#Runtime_C}; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; Components: Core
-Source: {#Runtime_CPP}; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; Components: Core
-Source: {#Runtime_CPP_Manifest}; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; Components: Core
-Source: {#Runtime_MFC_Manifest}; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; Components: Core
+; Microsoft runtime libraries installer (C-runtimes, MFC)
+Source: {#RuntimesX86Installer}; DestDir: {tmp}; Flags: ignoreversion; Components: Core; AfterInstall: RuntimesInstaller
; Shell extension
Source: ..\..\Build\ShellExtension\release mindependency\ShellExtension.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder; MinVersion: 4, 0; Check: not IsWin64
@@ -593,6 +583,18 @@
[Code]
+
+{Runs the runtime file installer}
+{Command line used is documented in:
+http://blogs.msdn.com/astebner/archive/2007/02/07/update-regarding-silent-install-of-the-vc-8-0-runtime-vcredist-packages.aspx
+}
+procedure RuntimesInstaller();
+var
+ ResultCode: Integer;
+begin
+ Exec(ExpandConstant('{tmp}\vcredist_x86.exe'), '/q:a /c:"VCREDI~3.EXE /q:a /c:""msiexec /i vcredist.msi /qn"" "', '', SW_SHOW, ewWaitUntilTerminated, ResultCode)
+end;
+
{Determines whether or not the user chose to create a start menu}
Function GroupCreated(): boolean;
Var
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-04-27 19:24:17
|
Revision: 7138
http://winmerge.svn.sourceforge.net/winmerge/?rev=7138&view=rev
Author: kimmov
Date: 2010-04-27 19:24:07 +0000 (Tue, 27 Apr 2010)
Log Message:
-----------
Installer: Fix couple of script syntax errors.
These were found after updating InnoSetup to latest version.
Modified Paths:
--------------
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2010-04-23 17:34:32 UTC (rev 7137)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2010-04-27 19:24:07 UTC (rev 7138)
@@ -764,7 +764,7 @@
{Stops analyzing the version number since we already know it's inadequate and returns False (inadequate)}
exit;
- end
+ end;
{Starts detecting the Minor version of the Version Installed}
@@ -1067,7 +1067,7 @@
Procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
var
appdir: String;
- selectedTasks: String;
+ selectedTasks: AnsiString;
Begin
appdir := ExpandConstant('{app}')
if CurUninstallStep = usUninstall then begin
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-04-23 17:34:40
|
Revision: 7137
http://winmerge.svn.sourceforge.net/winmerge/?rev=7137&view=rev
Author: kimmov
Date: 2010-04-23 17:34:32 +0000 (Fri, 23 Apr 2010)
Log Message:
-----------
PATCH: [ 2991295 ] Diff Pane doesn't show diffs (moved blocks)
Submitted by Matthias Mayer
Fixes bug #2988656
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/MergeDiffDetailView.cpp
trunk/Src/MergeEditView.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-04-23 10:10:21 UTC (rev 7136)
+++ trunk/Docs/Users/ChangeLog.txt 2010-04-23 17:34:32 UTC (rev 7137)
@@ -7,6 +7,8 @@
Update copyright year to 2010
Fix help locations (#2988974)
Bugfix: Strange scrolling effect in location pane (#2942869)
+ Bugfix: Difference panel didn't show differences when moved blocks were
+ enabled (#2988656)
Translation updates:
- Chinese Traditional (#2954833)
- French (#2968200)
Modified: trunk/Src/MergeDiffDetailView.cpp
===================================================================
--- trunk/Src/MergeDiffDetailView.cpp 2010-04-23 10:10:21 UTC (rev 7136)
+++ trunk/Src/MergeDiffDetailView.cpp 2010-04-23 17:34:32 UTC (rev 7137)
@@ -194,7 +194,7 @@
return 0;
DWORD dwLineFlags = GetLineFlags(nLineIndex);
- if ((dwLineFlags & LF_DIFF) != LF_DIFF || (dwLineFlags & LF_MOVED) == LF_MOVED)
+ if ((dwLineFlags & LF_DIFF) != LF_DIFF)
return 0; // No diff
if (!GetOptionsMgr()->GetBool(OPT_WORDDIFF_HIGHLIGHT))
Modified: trunk/Src/MergeEditView.cpp
===================================================================
--- trunk/Src/MergeEditView.cpp 2010-04-23 10:10:21 UTC (rev 7136)
+++ trunk/Src/MergeEditView.cpp 2010-04-23 17:34:32 UTC (rev 7137)
@@ -337,7 +337,7 @@
int CMergeEditView::GetAdditionalTextBlocks (int nLineIndex, TEXTBLOCK *pBuf)
{
DWORD dwLineFlags = GetLineFlags(nLineIndex);
- if ((dwLineFlags & LF_DIFF) != LF_DIFF || (dwLineFlags & LF_MOVED) == LF_MOVED)
+ if ((dwLineFlags & LF_DIFF) != LF_DIFF)
return 0;
if (!GetOptionsMgr()->GetBool(OPT_WORDDIFF_HIGHLIGHT))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-04-23 10:10:28
|
Revision: 7136
http://winmerge.svn.sourceforge.net/winmerge/?rev=7136&view=rev
Author: gerundt
Date: 2010-04-23 10:10:21 +0000 (Fri, 23 Apr 2010)
Log Message:
-----------
Web: Use GZIP compression from PHP for CSS files too
Modified Paths:
--------------
trunk/Web/.htaccess
trunk/Web/engine/css/print.css
trunk/Web/engine/css/screen.css
Modified: trunk/Web/.htaccess
===================================================================
--- trunk/Web/.htaccess 2010-04-23 09:35:36 UTC (rev 7135)
+++ trunk/Web/.htaccess 2010-04-23 10:10:21 UTC (rev 7136)
@@ -37,6 +37,10 @@
#Use PHP5 instead of PHP4
AddType x-mapp-php5 .php
+#Use PHP5 for CSS files
+AddType x-mapp-php5 .css
+#AddType application/x-httpd-php .css
+
#Redirect PAD download URL to current WinMerge version...
Redirect permanent /downloads/WinMerge-Setup.exe http://downloads.sourceforge.net/winmerge/WinMerge-2.12.4-Setup.exe
Modified: trunk/Web/engine/css/print.css
===================================================================
--- trunk/Web/engine/css/print.css 2010-04-23 09:35:36 UTC (rev 7135)
+++ trunk/Web/engine/css/print.css 2010-04-23 10:10:21 UTC (rev 7136)
@@ -1,3 +1,7 @@
+<?php
+ob_start('ob_gzhandler'); //Use GZIP compression from PHP, since 1and1 don't support it from Apache!
+header('Content-type: text/css');
+?>
body {
margin: 0;
padding: 0;
Modified: trunk/Web/engine/css/screen.css
===================================================================
--- trunk/Web/engine/css/screen.css 2010-04-23 09:35:36 UTC (rev 7135)
+++ trunk/Web/engine/css/screen.css 2010-04-23 10:10:21 UTC (rev 7136)
@@ -1,3 +1,7 @@
+<?php
+ob_start('ob_gzhandler'); //Use GZIP compression from PHP, since 1and1 don't support it from Apache!
+header('Content-type: text/css');
+?>
body {
margin: 0;
padding: 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-04-23 09:35:42
|
Revision: 7135
http://winmerge.svn.sourceforge.net/winmerge/?rev=7135&view=rev
Author: gerundt
Date: 2010-04-23 09:35:36 +0000 (Fri, 23 Apr 2010)
Log Message:
-----------
Web: Use GZIP compression from PHP, since 1and1 don't support it from Apache
Modified Paths:
--------------
trunk/Web/engine/page.inc
trunk/Web/translations/status_branch_rss.php
trunk/Web/translations/status_trunk_rss.php
Modified: trunk/Web/engine/page.inc
===================================================================
--- trunk/Web/engine/page.inc 2010-04-23 08:57:43 UTC (rev 7134)
+++ trunk/Web/engine/page.inc 2010-04-23 09:35:36 UTC (rev 7135)
@@ -107,6 +107,8 @@
* print the head from the page
*/
function printHead($title = '', $tab = '', $onload = '') {
+ ob_start('ob_gzhandler'); //Use GZIP compression from PHP, since 1and1 don't support it from Apache!
+
global $translations;
$this->_title = $title;
Modified: trunk/Web/translations/status_branch_rss.php
===================================================================
--- trunk/Web/translations/status_branch_rss.php 2010-04-23 08:57:43 UTC (rev 7134)
+++ trunk/Web/translations/status_branch_rss.php 2010-04-23 09:35:36 UTC (rev 7135)
@@ -1,4 +1,5 @@
<?php
+ ob_start('ob_gzhandler'); //Use GZIP compression from PHP, since 1and1 don't support it from Apache!
header('Content-type: application/rss+xml');
include('../engine/engine.inc');
Modified: trunk/Web/translations/status_trunk_rss.php
===================================================================
--- trunk/Web/translations/status_trunk_rss.php 2010-04-23 08:57:43 UTC (rev 7134)
+++ trunk/Web/translations/status_trunk_rss.php 2010-04-23 09:35:36 UTC (rev 7135)
@@ -1,4 +1,5 @@
<?php
+ ob_start('ob_gzhandler'); //Use GZIP compression from PHP, since 1and1 don't support it from Apache!
header('Content-type: application/rss+xml');
include('translations.inc');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-04-23 08:57:49
|
Revision: 7134
http://winmerge.svn.sourceforge.net/winmerge/?rev=7134&view=rev
Author: gerundt
Date: 2010-04-23 08:57:43 +0000 (Fri, 23 Apr 2010)
Log Message:
-----------
Web: Update Piwik java script code
Modified Paths:
--------------
trunk/Web/engine/page.inc
Modified: trunk/Web/engine/page.inc
===================================================================
--- trunk/Web/engine/page.inc 2010-04-23 08:52:00 UTC (rev 7133)
+++ trunk/Web/engine/page.inc 2010-04-23 08:57:43 UTC (rev 7134)
@@ -414,15 +414,15 @@
function getPiwikCode() {
$temp = "<!-- Piwik -->\n";
$temp .= "<script type=\"text/javascript\">\n";
- $temp .= "var pkBaseURL = ((\"https:\" == document.location.protocol) ? \"https://apps.sourceforge.net/piwik/winmerge/\" : \"http://apps.sourceforge.net/piwik/winmerge/\");\n";
+ $temp .= "var pkBaseURL = ((\"https:\" == document.location.protocol) ? \"https://sourceforge.net/apps/piwik/winmerge/\" : \"http://sourceforge.net/apps/piwik/winmerge/\");\n";
$temp .= "document.write(unescape(\"%3Cscript src='\" + pkBaseURL + \"piwik.js' type='text/javascript'%3E%3C/script%3E\"));\n";
$temp .= "</script><script type=\"text/javascript\">\n";
- $temp .= "piwik_action_name = '';\n";
- $temp .= "piwik_idsite = 1;\n";
- $temp .= "piwik_url = pkBaseURL + \"piwik.php\";\n";
- $temp .= "piwik_log(piwik_action_name, piwik_idsite, piwik_url);\n";
- $temp .= "</script>\n";
- $temp .= "<object><noscript><p><img src=\"http://apps.sourceforge.net/piwik/winmerge/piwik.php?idsite=1\" alt=\"piwik\"/></p></noscript></object>\n";
+ $temp .= "try {\n";
+ $temp .= "var piwikTracker = Piwik.getTracker(pkBaseURL + \"piwik.php\", 1);\n";
+ $temp .= "piwikTracker.trackPageView();\n";
+ $temp .= "piwikTracker.enableLinkTracking();\n";
+ $temp .= "} catch( err ) {}\n";
+ $temp .= "</script><noscript><p><img src=\"http://sourceforge.net/apps/piwik/winmerge/piwik.php?idsite=1\" style=\"border:0\" alt=\"\"/></p></noscript>\n";
$temp .= "<!-- End Piwik Tag -->\n";
return $temp;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-04-23 08:52:06
|
Revision: 7133
http://winmerge.svn.sourceforge.net/winmerge/?rev=7133&view=rev
Author: gerundt
Date: 2010-04-23 08:52:00 +0000 (Fri, 23 Apr 2010)
Log Message:
-----------
Web: Don't prepare link for manual and tour
Modified Paths:
--------------
trunk/Web/engine/page.inc
Modified: trunk/Web/engine/page.inc
===================================================================
--- trunk/Web/engine/page.inc 2010-04-23 08:47:21 UTC (rev 7132)
+++ trunk/Web/engine/page.inc 2010-04-23 08:52:00 UTC (rev 7133)
@@ -303,8 +303,8 @@
break;
case TAB_DOCS: //if "Documentation" ...
$subtabs[0] = new Subtab($translations->prepareLink('/docs/'), __('Index'), __('WinMerge Documentation'));
- $subtabs[1] = new Subtab($translations->prepareLink('/docs/manual/'), __('Manual'), __('WinMerge Manual'));
- $subtabs[2] = new Subtab($translations->prepareLink('/docs/tour/'), __('Quick Tour'), __('WinMerge Quick Tour'));
+ $subtabs[1] = new Subtab('/docs/manual/', __('Manual'), __('WinMerge Manual'));
+ $subtabs[2] = new Subtab('/docs/tour/', __('Quick Tour'), __('WinMerge Quick Tour'));
$subtabs[3] = new Subtab($translations->prepareLink('/docs/releasenotes.php'), __('Release Notes'), __('WinMerge Release Notes'));
$subtabs[4] = new Subtab($translations->prepareLink('/docs/releasenotes.php#issues'), __('Known Issues'), __('WinMerge Known Issues'));
$subtabs[5] = new Subtab($translations->prepareLink('/docs/changelog.php'), __('Change Log'), __('WinMerge Change Log'));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-04-23 08:47:33
|
Revision: 7132
http://winmerge.svn.sourceforge.net/winmerge/?rev=7132&view=rev
Author: gerundt
Date: 2010-04-23 08:47:21 +0000 (Fri, 23 Apr 2010)
Log Message:
-----------
PATCH: [ 2988974 ] Fix help locations
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/DirView.cpp
branches/R2_12/Src/Merge.cpp
branches/R2_12/Src/MergeEditView.cpp
branches/R2_12/Src/OpenDlg.cpp
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2010-04-23 08:46:54 UTC (rev 7131)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2010-04-23 08:47:21 UTC (rev 7132)
@@ -5,6 +5,7 @@
WinMerge 2.12.6
Add missing keywords to Pascal highlighter (#2834192)
+ Fix help locations (#2988974)
Translation updates:
- Dutch (#2804979)
- French (#2850842, #2968200)
Modified: branches/R2_12/Src/DirView.cpp
===================================================================
--- branches/R2_12/Src/DirView.cpp 2010-04-23 08:46:54 UTC (rev 7131)
+++ branches/R2_12/Src/DirView.cpp 2010-04-23 08:47:21 UTC (rev 7132)
@@ -61,7 +61,7 @@
/**
* @brief Location for folder compare specific help to open.
*/
-static TCHAR DirViewHelpLocation[] = _T("::/htmlhelp/CompareDirs.html");
+static TCHAR DirViewHelpLocation[] = _T("::/htmlhelp/Compare_dirs.html");
/**
* @brief Limit (in seconds) to signal compare is ready for user.
Modified: branches/R2_12/Src/Merge.cpp
===================================================================
--- branches/R2_12/Src/Merge.cpp 2010-04-23 08:46:54 UTC (rev 7131)
+++ branches/R2_12/Src/Merge.cpp 2010-04-23 08:47:21 UTC (rev 7132)
@@ -69,7 +69,7 @@
/** @brief Location for command line help to open. */
-static TCHAR CommandLineHelpLocation[] = _T("::/htmlhelp/CommandLine.html");
+static TCHAR CommandLineHelpLocation[] = _T("::/htmlhelp/Command_line.html");
/////////////////////////////////////////////////////////////////////////////
// CMergeApp
Modified: branches/R2_12/Src/MergeEditView.cpp
===================================================================
--- branches/R2_12/Src/MergeEditView.cpp 2010-04-23 08:46:54 UTC (rev 7131)
+++ branches/R2_12/Src/MergeEditView.cpp 2010-04-23 08:47:21 UTC (rev 7132)
@@ -61,7 +61,7 @@
const UINT RESCAN_TIMEOUT = 1000;
/** @brief Location for file compare specific help to open. */
-static TCHAR MergeViewHelpLocation[] = _T("::/htmlhelp/CompareFiles.html");
+static TCHAR MergeViewHelpLocation[] = _T("::/htmlhelp/Compare_files.html");
/////////////////////////////////////////////////////////////////////////////
// CMergeEditView
Modified: branches/R2_12/Src/OpenDlg.cpp
===================================================================
--- branches/R2_12/Src/OpenDlg.cpp 2010-04-23 08:46:54 UTC (rev 7131)
+++ branches/R2_12/Src/OpenDlg.cpp 2010-04-23 08:47:21 UTC (rev 7132)
@@ -58,7 +58,7 @@
static const TCHAR EMPTY_EXTENSION[] = _T(".*");
/** @brief Location for Open-dialog specific help to open. */
-static TCHAR OpenDlgHelpLocation[] = _T("::/htmlhelp/OpenPaths.html");
+static TCHAR OpenDlgHelpLocation[] = _T("::/htmlhelp/Open_paths.html");
/////////////////////////////////////////////////////////////////////////////
// COpenDlg dialog
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-04-23 08:47:01
|
Revision: 7131
http://winmerge.svn.sourceforge.net/winmerge/?rev=7131&view=rev
Author: gerundt
Date: 2010-04-23 08:46:54 +0000 (Fri, 23 Apr 2010)
Log Message:
-----------
PATCH: [ 2988974 ] Fix help locations
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/DirView.cpp
trunk/Src/Merge.cpp
trunk/Src/MergeEditView.cpp
trunk/Src/OpenDlg.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-04-21 16:31:24 UTC (rev 7130)
+++ trunk/Docs/Users/ChangeLog.txt 2010-04-23 08:46:54 UTC (rev 7131)
@@ -5,6 +5,7 @@
WinMerge 2.13.12
Update copyright year to 2010
+ Fix help locations (#2988974)
Bugfix: Strange scrolling effect in location pane (#2942869)
Translation updates:
- Chinese Traditional (#2954833)
Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp 2010-04-21 16:31:24 UTC (rev 7130)
+++ trunk/Src/DirView.cpp 2010-04-23 08:46:54 UTC (rev 7131)
@@ -62,7 +62,7 @@
/**
* @brief Location for folder compare specific help to open.
*/
-static TCHAR DirViewHelpLocation[] = _T("::/htmlhelp/CompareDirs.html");
+static TCHAR DirViewHelpLocation[] = _T("::/htmlhelp/Compare_dirs.html");
/**
* @brief Limit (in seconds) to signal compare is ready for user.
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2010-04-21 16:31:24 UTC (rev 7130)
+++ trunk/Src/Merge.cpp 2010-04-23 08:46:54 UTC (rev 7131)
@@ -70,7 +70,7 @@
/** @brief Location for command line help to open. */
-static TCHAR CommandLineHelpLocation[] = _T("::/htmlhelp/CommandLine.html");
+static TCHAR CommandLineHelpLocation[] = _T("::/htmlhelp/Command_line.html");
/////////////////////////////////////////////////////////////////////////////
// CMergeApp
Modified: trunk/Src/MergeEditView.cpp
===================================================================
--- trunk/Src/MergeEditView.cpp 2010-04-21 16:31:24 UTC (rev 7130)
+++ trunk/Src/MergeEditView.cpp 2010-04-23 08:46:54 UTC (rev 7131)
@@ -61,7 +61,7 @@
const UINT RESCAN_TIMEOUT = 1000;
/** @brief Location for file compare specific help to open. */
-static TCHAR MergeViewHelpLocation[] = _T("::/htmlhelp/CompareFiles.html");
+static TCHAR MergeViewHelpLocation[] = _T("::/htmlhelp/Compare_files.html");
/////////////////////////////////////////////////////////////////////////////
// CMergeEditView
Modified: trunk/Src/OpenDlg.cpp
===================================================================
--- trunk/Src/OpenDlg.cpp 2010-04-21 16:31:24 UTC (rev 7130)
+++ trunk/Src/OpenDlg.cpp 2010-04-23 08:46:54 UTC (rev 7131)
@@ -58,7 +58,7 @@
static const TCHAR EMPTY_EXTENSION[] = _T(".*");
/** @brief Location for Open-dialog specific help to open. */
-static TCHAR OpenDlgHelpLocation[] = _T("::/htmlhelp/OpenPaths.html");
+static TCHAR OpenDlgHelpLocation[] = _T("::/htmlhelp/Open_paths.html");
/////////////////////////////////////////////////////////////////////////////
// COpenDlg dialog
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-04-21 16:31:31
|
Revision: 7130
http://winmerge.svn.sourceforge.net/winmerge/?rev=7130&view=rev
Author: kimmov
Date: 2010-04-21 16:31:24 +0000 (Wed, 21 Apr 2010)
Log Message:
-----------
Update copyright year to 2010.
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Merge.rc
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-03-15 13:26:54 UTC (rev 7129)
+++ trunk/Docs/Users/ChangeLog.txt 2010-04-21 16:31:24 UTC (rev 7130)
@@ -4,7 +4,8 @@
http://winmerge.org/tracker/[tracker-id]
WinMerge 2.13.12
- Bugfix: Strange scrolling effect in location pane (#2942869)
+ Update copyright year to 2010
+ Bugfix: Strange scrolling effect in location pane (#2942869)
Translation updates:
- Chinese Traditional (#2954833)
- French (#2968200)
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2010-03-15 13:26:54 UTC (rev 7129)
+++ trunk/Src/Merge.rc 2010-04-21 16:31:24 UTC (rev 7130)
@@ -1727,7 +1727,7 @@
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "(c) 1996-2009 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "(c) 1996-2010 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-03-15 13:27:05
|
Revision: 7129
http://winmerge.svn.sourceforge.net/winmerge/?rev=7129&view=rev
Author: gerundt
Date: 2010-03-15 13:26:54 +0000 (Mon, 15 Mar 2010)
Log Message:
-----------
PATCH: [ 2968200 ] French.isl updated
Submitted by Jean-F Jolin
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Installer/InnoSetup/Languages/French.isl
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2010-03-15 13:23:21 UTC (rev 7128)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2010-03-15 13:26:54 UTC (rev 7129)
@@ -7,7 +7,7 @@
Add missing keywords to Pascal highlighter (#2834192)
Translation updates:
- Dutch (#2804979)
- - French (#2850842)
+ - French (#2850842, #2968200)
- Slovenian (#2917796, #2932094, #2934354)
- Spanish (#2930734)
- Turkish (#2825132, #2827817)
Modified: branches/R2_12/Installer/InnoSetup/Languages/French.isl
===================================================================
--- branches/R2_12/Installer/InnoSetup/Languages/French.isl 2010-03-15 13:23:21 UTC (rev 7128)
+++ branches/R2_12/Installer/InnoSetup/Languages/French.isl 2010-03-15 13:26:54 UTC (rev 7129)
@@ -8,9 +8,9 @@
; Setup adds the periods automatically (appending a period would result in
; two periods being displayed).
;
-; Maintained by Pierre Yager (pi...@le...)
+; Maintainer : Jean-F Jolin <jean-f-j at users.sourceforge.net>
;
-; Contributors : Fr\xE9d\xE9ric Bonduelle, Francis Pallini
+; Contributors : Pierre Yager, Fr\xE9d\xE9ric Bonduelle, Francis Pallini
;
; $jrsoftware: issrc/Files/Languages/French.isl,v 1.14 2007/02/27 18:22:41 jr Exp $
@@ -345,6 +345,7 @@
JapaneseLanguage=Menus et dialogues Japonais
KoreanLanguage=Menus et dialogues Cor\xE9en
NorwegianLanguage=Menus et dialogues Norv\xE9gien
+PersianLanguage=Menus et dialogues Perse
PolishLanguage=Menus et dialogues Polonais
PortugueseBrazilLanguage=Menus et dialogues Portugais (Br\xE9silien)
PortugueseLanguage=Menus et dialogues Portugais
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-03-15 13:23:33
|
Revision: 7128
http://winmerge.svn.sourceforge.net/winmerge/?rev=7128&view=rev
Author: gerundt
Date: 2010-03-15 13:23:21 +0000 (Mon, 15 Mar 2010)
Log Message:
-----------
PATCH: [ 2968200 ] French.isl updated
Submitted by Jean-F Jolin
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Translations/InnoSetup/French.isl
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-03-10 21:03:58 UTC (rev 7127)
+++ trunk/Docs/Users/ChangeLog.txt 2010-03-15 13:23:21 UTC (rev 7128)
@@ -7,6 +7,7 @@
Bugfix: Strange scrolling effect in location pane (#2942869)
Translation updates:
- Chinese Traditional (#2954833)
+ - French (#2968200)
- Polish (#2951149)
- Slovenian (#2934354)
- Swedish (#2943964)
Modified: trunk/Translations/InnoSetup/French.isl
===================================================================
--- trunk/Translations/InnoSetup/French.isl 2010-03-10 21:03:58 UTC (rev 7127)
+++ trunk/Translations/InnoSetup/French.isl 2010-03-15 13:23:21 UTC (rev 7128)
@@ -8,9 +8,9 @@
; Setup adds the periods automatically (appending a period would result in
; two periods being displayed).
;
-; Maintained by Pierre Yager (pi...@le...)
+; Maintainer : Jean-F Jolin <jean-f-j at users.sourceforge.net>
;
-; Contributors : Fr\xE9d\xE9ric Bonduelle, Francis Pallini
+; Contributors : Pierre Yager, Fr\xE9d\xE9ric Bonduelle, Francis Pallini
;
; $jrsoftware: issrc/Files/Languages/French.isl,v 1.14 2007/02/27 18:22:41 jr Exp $
@@ -345,7 +345,7 @@
JapaneseLanguage=Menus et dialogues Japonais
KoreanLanguage=Menus et dialogues Cor\xE9en
NorwegianLanguage=Menus et dialogues Norv\xE9gien
-PersianLanguage=Persian menus and dialogs
+PersianLanguage=Menus et dialogues Perse
PolishLanguage=Menus et dialogues Polonais
PortugueseBrazilLanguage=Menus et dialogues Portugais (Br\xE9silien)
PortugueseLanguage=Menus et dialogues Portugais
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-03-10 21:04:05
|
Revision: 7127
http://winmerge.svn.sourceforge.net/winmerge/?rev=7127&view=rev
Author: kimmov
Date: 2010-03-10 21:03:58 +0000 (Wed, 10 Mar 2010)
Log Message:
-----------
PATCH: [ 2942869 ] Location Pane scrolling
Fixes bug #2915350
Submitted by Matthias Mayer
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/LocationView.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-03-03 19:59:07 UTC (rev 7126)
+++ trunk/Docs/Users/ChangeLog.txt 2010-03-10 21:03:58 UTC (rev 7127)
@@ -4,6 +4,7 @@
http://winmerge.org/tracker/[tracker-id]
WinMerge 2.13.12
+ Bugfix: Strange scrolling effect in location pane (#2942869)
Translation updates:
- Chinese Traditional (#2954833)
- Polish (#2951149)
Modified: trunk/Src/LocationView.cpp
===================================================================
--- trunk/Src/LocationView.cpp 2010-03-03 19:59:07 UTC (rev 7126)
+++ trunk/Src/LocationView.cpp 2010-03-10 21:03:58 UTC (rev 7127)
@@ -919,12 +919,12 @@
// Make sure locationbox has min hight
if ((nBottomCoord - nTopCoord) < INDICATOR_MIN_HEIGHT)
{
- int iPos = (INDICATOR_MIN_HEIGHT - (nBottomCoord - nTopCoord) )/2;
- nTopCoord -= iPos;
- nBottomCoord +=iPos;
+ // If we have a high number of lines, it may be better
+ // to keep the topline, otherwise the cursor can
+ // jump up and down unexpected
+ nBottomCoord = nTopCoord + INDICATOR_MIN_HEIGHT;
}
}
-
}
// Store current values for later use (to check if area changes)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-03-03 19:59:13
|
Revision: 7126
http://winmerge.svn.sourceforge.net/winmerge/?rev=7126&view=rev
Author: gerundt
Date: 2010-03-03 19:59:07 +0000 (Wed, 03 Mar 2010)
Log Message:
-----------
Fix slight gramatical error in Contributors.txt
Submitted by Alex Clarke
Modified Paths:
--------------
branches/R2_12/Docs/Users/Contributors.txt
Modified: branches/R2_12/Docs/Users/Contributors.txt
===================================================================
--- branches/R2_12/Docs/Users/Contributors.txt 2010-03-03 19:56:34 UTC (rev 7125)
+++ branches/R2_12/Docs/Users/Contributors.txt 2010-03-03 19:59:07 UTC (rev 7126)
@@ -189,7 +189,7 @@
* Andrei Stcherbatchenko (CrystalEditor)
*** NOTE ***
-If your name is missing please send email us to:
+If your name is missing please email us at:
win...@li...
Thanks!
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-03-03 19:56:40
|
Revision: 7125
http://winmerge.svn.sourceforge.net/winmerge/?rev=7125&view=rev
Author: gerundt
Date: 2010-03-03 19:56:34 +0000 (Wed, 03 Mar 2010)
Log Message:
-----------
Fix slight gramatical error in Contributors.txt
Submitted by Alex Clarke
Modified Paths:
--------------
trunk/Docs/Users/Contributors.txt
Modified: trunk/Docs/Users/Contributors.txt
===================================================================
--- trunk/Docs/Users/Contributors.txt 2010-02-19 19:25:08 UTC (rev 7124)
+++ trunk/Docs/Users/Contributors.txt 2010-03-03 19:56:34 UTC (rev 7125)
@@ -195,7 +195,7 @@
* Andrei Stcherbatchenko (CrystalEditor)
*** NOTE ***
-If your name is missing please send email us to:
+If your name is missing please email us at:
win...@li...
Thanks!
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-02-19 19:25:14
|
Revision: 7124
http://winmerge.svn.sourceforge.net/winmerge/?rev=7124&view=rev
Author: gerundt
Date: 2010-02-19 19:25:08 +0000 (Fri, 19 Feb 2010)
Log Message:
-----------
PATCH: [ 2951149 ] Updated polish language file
Submitted by Skiff
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Translations/WinMerge/Polish.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-02-19 19:03:56 UTC (rev 7123)
+++ trunk/Docs/Users/ChangeLog.txt 2010-02-19 19:25:08 UTC (rev 7124)
@@ -6,6 +6,7 @@
WinMerge 2.13.12
Translation updates:
- Chinese Traditional (#2954833)
+ - Polish (#2951149)
- Slovenian (#2934354)
- Swedish (#2943964)
Modified: trunk/Translations/WinMerge/Polish.po
===================================================================
--- trunk/Translations/WinMerge/Polish.po 2010-02-19 19:03:56 UTC (rev 7123)
+++ trunk/Translations/WinMerge/Polish.po 2010-02-19 19:25:08 UTC (rev 7124)
@@ -13,9 +13,9 @@
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2009-07-23 18:36+0000\n"
-"PO-Revision-Date: 2009-09-11 17:14+0100\n"
-"Last-Translator: Micha\xB3 Trzebiatowski <hip...@ho...>\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2010-02-13 10:28 +0100\n"
+"Last-Translator: Skiff <skiffatsf at users.sourceforge.net>\n"
"Language-Team: Polish <win...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CP1250\n"
@@ -53,7 +53,7 @@
#: Merge.rc:75
#, c-format
msgid "&Select Line Difference"
-msgstr "Zaznacz r\xF3\xBFnic\xEA w &linii"
+msgstr "Zaznacz r\xF3\xBFnic\xEA w &wierszach"
#: Merge.rc:77
#, c-format
@@ -304,14 +304,14 @@
#: Merge.rc:459
#, c-format
msgid "&Manual Unpacking"
-msgstr "Rozpakuj &r\xEAcznie"
+msgstr "Rozpakowywanie &r\xEAcznie"
#: Merge.rc:156
#: Merge.rc:277
#: Merge.rc:460
#, c-format
msgid "&Automatic Unpacking"
-msgstr "Rozpakuj &automatycznie"
+msgstr "Rozpakowywanie &automatycznie"
#: Merge.rc:158
#: Merge.rc:279
@@ -339,14 +339,14 @@
#: Merge.rc:473
#, c-format
msgid "&Load Config..."
-msgstr "Za\xB3a&duj ustawienia..."
+msgstr "Wczytaj ustawienia..."
#: Merge.rc:165
#: Merge.rc:286
#: Merge.rc:474
#, c-format
msgid "&Reset Options"
-msgstr "&Resetuj opcje"
+msgstr "P&rzywr\xF3\xE6 ustawienia"
#: Merge.rc:167
#: Merge.rc:288
@@ -410,7 +410,7 @@
#: Merge.rc:489
#, c-format
msgid "&WinMerge Help\tF1"
-msgstr "Pomoc &WinMerge\tF1"
+msgstr "&WinMerge - pomoc\tF1"
#: Merge.rc:182
#: Merge.rc:303
@@ -452,7 +452,7 @@
#: Merge.rc:497
#, c-format
msgid "&About WinMerge..."
-msgstr "&O programie..."
+msgstr "WinMerge - inf&ormacje..."
#: Merge.rc:203
#: Merge.rc:340
@@ -653,7 +653,7 @@
#: Merge.rc:338
#, c-format
msgid "Print Previe&w"
-msgstr "Drukuj &Podgl\xB9d"
+msgstr "&Podgl\xB9d wydruku"
#: Merge.rc:343
#, c-format
@@ -731,7 +731,7 @@
msgstr "&Skrypty"
#: Merge.rc:373
-#: Merge.rc:2807
+#: Merge.rc:2708
#, c-format
msgid "< Empty >"
msgstr "< pusty >"
@@ -800,7 +800,7 @@
#: Merge.rc:402
#, c-format
msgid "Syntax Highlight"
-msgstr "Pod\x9Cwietlanie sk\xB3adni"
+msgstr "Kolorowanie sk\xB3adni"
#: Merge.rc:407
#, c-format
@@ -815,12 +815,12 @@
#: Merge.rc:409
#, c-format
msgid "Vie&w Line Differences"
-msgstr "Poka\xBF r\xF3\xBFnice &linii"
+msgstr "Poka\xBF r\xF3\xBFnice &wierszy"
#: Merge.rc:410
#, c-format
msgid "View Line &Numbers"
-msgstr "Poka\xBF &numery linii"
+msgstr "Poka\xBF &numery wierszy"
#: Merge.rc:411
#, c-format
@@ -830,7 +830,7 @@
#: Merge.rc:412
#, c-format
msgid "W&rap Lines"
-msgstr "Za&wijaj linie"
+msgstr "Za&wijaj wiersze"
#: Merge.rc:414
#, c-format
@@ -850,12 +850,12 @@
#: Merge.rc:443
#, c-format
msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
-msgstr "Kopiuj na prawo i przejd\x9F dalej\tAlt+Ctrl+Right"
+msgstr "Kopiuj na prawo i przejd\x9F dalej\tAlt+Ctrl+W prawo"
#: Merge.rc:444
#, c-format
msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
-msgstr "Kopiuj na lewo i przejd\x9F dalej\tAlt+Ctrl+Left"
+msgstr "Kopiuj na lewo i przejd\x9F dalej\tAlt+Ctrl+W lewo"
#: Merge.rc:446
#, c-format
@@ -1074,7 +1074,7 @@
#: Merge.rc:668
#, c-format
msgid "About WinMerge"
-msgstr "O programie WinMerge"
+msgstr "WinMerge - informacje"
#: Merge.rc:674
#, c-format
@@ -1089,7 +1089,7 @@
#: Merge.rc:676
#, c-format
msgid "Visit the WinMerge HomePage!"
-msgstr "Zajrzyj na stron\xEA WinMerge!"
+msgstr "Odwied\x9F stron\xEA domow\xB9 WinMerge!"
#: Merge.rc:679
#: Merge.rc:711
@@ -1116,7 +1116,7 @@
#: Merge.rc:687
#, c-format
msgid "Select Files or Folders"
-msgstr "Wybierz pliki lub katalogi..."
+msgstr "Wybierz pliki lub foldery..."
#: Merge.rc:690
#: Merge.rc:1591
@@ -1130,7 +1130,7 @@
#: Merge.rc:1031
#, c-format
msgid "&Browse..."
-msgstr "&Szukaj..."
+msgstr "&Przegl\xB9daj..."
#: Merge.rc:695
#: Merge.rc:1595
@@ -1268,7 +1268,7 @@
#: Merge.rc:2083
#, c-format
msgid "&Path to cleartool.exe:"
-msgstr "S&cie\xBFka cleartool.exe:"
+msgstr "S&cie\xBFka do cleartool.exe:"
#: Merge.rc:760
#: Merge.rc:1956
@@ -1295,7 +1295,7 @@
#: Merge.rc:770
#, c-format
msgid "&Automatically verify paths in Open-dialog"
-msgstr "Automatycznie weryfikuj \x9Ccie\xBFki w oknie Otw\xF3rz"
+msgstr "Automatycznie weryfikuj \x9Ccie\xBFki w oknie otwierania plik\xF3w"
#: Merge.rc:773
#, c-format
@@ -1569,7 +1569,7 @@
#: Merge.rc:976
#, c-format
msgid "Selected Word Diff:"
-msgstr "Wybrana r\xF3\xBFnica-s\xB3owo:"
+msgstr "Wybrana r\xF3\xBFnica s\xB3owa:"
#: Merge.rc:986
#: Merge.rc:1065
@@ -1896,7 +1896,7 @@
#: Merge.rc:1189
#, c-format
msgid "&Preserve original EOL chars"
-msgstr "Zapisz &oryginalne znaki ko\xF1ca linii"
+msgstr "Zachowaj &oryginalne znaki ko\xF1ca linii"
#: Merge.rc:1191
#, c-format
@@ -2062,7 +2062,7 @@
#: Merge.rc:1286
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
-msgstr "Nie mo\xBFna wykry\xE6 wersji 7-Zip (nie jest zainstalowany?)"
+msgstr "Nie mo\xBFna wykry\xE6 wersji 7-Zip (mo\xBFe nie by\xE6 zainstalowany)"
#: Merge.rc:1289
#, c-format
@@ -3442,7 +3442,7 @@
msgstr "Wielko\x9C\xE6"
#: Merge.rc:2046
-#: Merge.rc:2671
+#: Merge.rc:2572
#, c-format
msgid "Name"
msgstr "Nazwa"
@@ -3463,7 +3463,7 @@
msgstr "[F] "
#: Merge.rc:2050
-#: Merge.rc:2673
+#: Merge.rc:2574
#, c-format
msgid "Description"
msgstr "Opis"
@@ -4002,7 +4002,7 @@
" Prosz\xEA sprawdzi\xE6 config_spec u\xBFywanego widoku."
#: Merge.rc:2202
-#: Merge.rc:2655
+#: Merge.rc:2556
#, c-format
msgid "None"
msgstr "Brak"
@@ -4434,7 +4434,7 @@
msgstr "Ignorowane r\xF3\xBFn."
#: Merge.rc:2340
-#: Merge.rc:2651
+#: Merge.rc:2552
#, c-format
msgid "Binary"
msgstr "Binarne"
@@ -5088,406 +5088,140 @@
#: Merge.rc:2548
#, c-format
-msgid "Western European"
-msgstr "Zachodnia Europa"
-
-#: Merge.rc:2549
-#, c-format
-msgid "Eastern European"
-msgstr "Wschodnia Europa"
-
-#: Merge.rc:2550
-#, c-format
-msgid "East Asian"
-msgstr "Wschodnia Azja"
-
-#: Merge.rc:2551
-#, c-format
-msgid "SE & SW Asian"
-msgstr "Po\xB3udniowa Azja"
-
-#: Merge.rc:2552
-#, c-format
-msgid "Middle Eastern"
-msgstr "\x8Crodkowy Wsch\xF3d"
-
-#: Merge.rc:2553
-#: Merge.rc:2563
-#, c-format
-msgid "Not applicable"
-msgstr "Nie stosuje si\xEA"
-
-#: Merge.rc:2559
-#, c-format
-msgid "MS-Windows"
-msgstr "MS-Windows"
-
-#: Merge.rc:2560
-#, c-format
-msgid "MS-DOS"
-msgstr "MS-DOS"
-
-#: Merge.rc:2561
-#, c-format
-msgid "Macintosh"
-msgstr "Macintosh"
-
-#: Merge.rc:2562
-#, c-format
-msgid "IBM"
-msgstr "IBM"
-
-#: Merge.rc:2569
-#, c-format
-msgid "EBCDIC"
-msgstr "EBCDIC"
-
-#: Merge.rc:2570
-#, c-format
-msgid "IBM EBCDIC Cyrillic"
-msgstr "IBM EBCDIC Cyrylica"
-
-#: Merge.rc:2576
-#, c-format
-msgid "MS-DOS Latin US"
-msgstr "MS-DOS \xA3aci\xF1ski US"
-
-#: Merge.rc:2577
-#, c-format
-msgid "MS-DOS Arabic"
-msgstr "MS-DOS Arabski"
-
-#: Merge.rc:2578
-#, c-format
-msgid "MS-DOS Greek"
-msgstr "MS-DOS Grecki"
-
-#: Merge.rc:2579
-#, c-format
-msgid "MS-DOS Baltic Rim"
-msgstr "MS-DOS Kr.Ba\xB3tyckie"
-
-#: Merge.rc:2580
-#, c-format
-msgid "MS-DOS Latin 1"
-msgstr "MS-DOS \xA3aci\xF1ski 1"
-
-#: Merge.rc:2581
-#, c-format
-msgid "MS-DOS Greek 1"
-msgstr "MS-DOS Grecki 1"
-
-#: Merge.rc:2582
-#, c-format
-msgid "MS-DOS Latin 2"
-msgstr "MS-DOS \xA3aci\xF1ski 2"
-
-#: Merge.rc:2583
-#, c-format
-msgid "MS-DOS Cyrillic"
-msgstr "MS-DOS Cyrylica"
-
-#: Merge.rc:2584
-#, c-format
-msgid "MS-DOS Turkish"
-msgstr "MS-DOS Turecki"
-
-#: Merge.rc:2585
-#, c-format
-msgid "MS-DOS Portuguese"
-msgstr "MS-DOS Portugalski"
-
-#: Merge.rc:2591
-#, c-format
-msgid "MS-DOS Icelandic"
-msgstr "MS-DOS Islandzki"
-
-#: Merge.rc:2592
-#, c-format
-msgid "MS-DOS Hebrew"
-msgstr "MS-DOS Hebrajski"
-
-#: Merge.rc:2593
-#, c-format
-msgid "MS-DOS French Canada"
-msgstr "MS-DOS Francuski (Kanada)"
-
-#: Merge.rc:2594
-#, c-format
-msgid "MS-DOS Nordic"
-msgstr "MS-DOS Skandynawski"
-
-#: Merge.rc:2595
-#, c-format
-msgid "MS-DOS Cyrillic CIS 1"
-msgstr "MS-DOS Cyrylica CIS 1"
-
-#: Merge.rc:2596
-#, c-format
-msgid "MS-DOS Greek 2"
-msgstr "MS-DOS Grecki 2"
-
-#: Merge.rc:2602
-#, c-format
-msgid "Windows Thai"
-msgstr "Windows Tajski"
-
-#: Merge.rc:2603
-#, c-format
-msgid "Windows Japanese"
-msgstr "Windows Japo\xF1ski"
-
-#: Merge.rc:2604
-#, c-format
-msgid "Windows Simplified Chinese"
-msgstr "Windows Chi\xF1ski (uproszczony)"
-
-#: Merge.rc:2605
-#, c-format
-msgid "Windows Korean"
-msgstr "Windows Korea\xF1ski"
-
-#: Merge.rc:2606
-#, c-format
-msgid "Windows Traditional Chinese"
-msgstr "Windows Chi\xF1ski (tradycyjny)"
-
-#: Merge.rc:2607
-#, c-format
-msgid "Windows Latin 2"
-msgstr "Windows \xA3aci\xF1ski 2"
-
-#: Merge.rc:2608
-#, c-format
-msgid "Windows Cyrillic (Slavic)"
-msgstr "Windows Cyrylica (S\xB3owia\xF1skie)"
-
-#: Merge.rc:2609
-#, c-format
-msgid "Windows Latin 1"
-msgstr "Windows \xA3aci\xF1ski 1"
-
-#: Merge.rc:2610
-#, c-format
-msgid "Windows Greek"
-msgstr "Windows Grecki"
-
-#: Merge.rc:2611
-#, c-format
-msgid "Windows Latin 5 (Turkish)"
-msgstr "Windows \xA3aci\xF1ski 5 (Turecki)"
-
-#: Merge.rc:2612
-#, c-format
-msgid "Windows Hebrew"
-msgstr "Windows Hebrajski"
-
-#: Merge.rc:2613
-#, c-format
-msgid "Windows Arabic"
-msgstr "Windows Arabski"
-
-#: Merge.rc:2614
-#, c-format
-msgid "Windows Baltic Rim"
-msgstr "Windows Kr.Ba\xB3tyckie"
-
-#: Merge.rc:2615
-#, c-format
-msgid "Windows Vietnamese"
-msgstr "Windows Wietnamski"
-
-#: Merge.rc:2621
-#, c-format
-msgid "Macintosh Roman"
-msgstr "Macintosh Roma\xF1ski"
-
-#: Merge.rc:2622
-#, c-format
-msgid "Macintosh Greek"
-msgstr "Macintosh Grecki"
-
-#: Merge.rc:2623
-#, c-format
-msgid "Macintosh Cyrillic"
-msgstr "Macintosh Cyrylica"
-
-#: Merge.rc:2624
-#, c-format
-msgid "Macintosh "
-msgstr "Macintosh "
-
-#: Merge.rc:2625
-#, c-format
-msgid "Macintosh Central Europe"
-msgstr "Macintosh Europa \x8Crodkowa"
-
-#: Merge.rc:2626
-#, c-format
-msgid "Macintosh Turkish"
-msgstr "Macintosh Turecki"
-
-#: Merge.rc:2635
-#, c-format
-msgid "Approximates ISO-8859-2"
-msgstr "Kodowanie ISO-8859-2"
-
-#: Merge.rc:2638
-#, c-format
-msgid "Approximates ISO-8859-1"
-msgstr "Kodowanie ISO-8859-1"
-
-#: Merge.rc:2639
-#, c-format
-msgid "Approximates ISO-8859-7"
-msgstr "Kodowanie ISO-8859-7"
-
-#: Merge.rc:2640
-#, c-format
-msgid "Approximates ISO-8859-9"
-msgstr "Kodowanie ISO-8859-9"
-
-#: Merge.rc:2641
-#, c-format
-msgid "Approximates ISO-8859-8"
-msgstr "Kodowanie ISO-8859-8"
-
-#: Merge.rc:2647
-#, c-format
msgid "Win"
msgstr "Win"
-#: Merge.rc:2648
+#: Merge.rc:2549
#, c-format
msgid "Mac"
msgstr "Mac"
-#: Merge.rc:2649
+#: Merge.rc:2550
#, c-format
msgid "Unix"
msgstr "Unix"
-#: Merge.rc:2650
+#: Merge.rc:2551
#, c-format
msgid "Mixed"
msgstr "\xA3\xB9czone"
-#: Merge.rc:2652
+#: Merge.rc:2553
#, c-format
msgid "LF"
msgstr "LF"
-#: Merge.rc:2653
+#: Merge.rc:2554
#, c-format
msgid "CR"
msgstr "CR"
-#: Merge.rc:2654
+#: Merge.rc:2555
#, c-format
msgid "CRLF"
msgstr "CRLF"
-#: Merge.rc:2661
+#: Merge.rc:2562
#, c-format
msgid " B"
msgstr " B"
-#: Merge.rc:2662
+#: Merge.rc:2563
#, c-format
msgid " KB"
msgstr " KB"
-#: Merge.rc:2663
+#: Merge.rc:2564
#, c-format
msgid " MB"
msgstr " MB"
-#: Merge.rc:2664
+#: Merge.rc:2565
#, c-format
msgid " GB"
msgstr " GB"
-#: Merge.rc:2665
+#: Merge.rc:2566
#, c-format
msgid " TB"
msgstr " TB"
-#: Merge.rc:2666
+#: Merge.rc:2567
#, c-format
msgid " PB"
msgstr " PB"
-#: Merge.rc:2672
+#: Merge.rc:2573
#, c-format
msgid "Type"
msgstr "Typ"
-#: Merge.rc:2674
+#: Merge.rc:2575
#, c-format
msgid "Unpacker"
msgstr "Program rozpakowuj\xB9cy"
-#: Merge.rc:2675
+#: Merge.rc:2576
#, c-format
msgid "Prediffer"
msgstr "R\xF3\xBFnicowanie wst\xEApne"
-#: Merge.rc:2676
+#: Merge.rc:2577
#, c-format
msgid "Editor script"
msgstr "Skrypt edytora"
-#: Merge.rc:2683
+#: Merge.rc:2584
#, c-format
msgid "Save the left file"
msgstr "Zapisz lewy plik"
-#: Merge.rc:2684
+#: Merge.rc:2585
#, c-format
msgid "Save the right file"
msgstr "Zapisz prawy plik"
-#: Merge.rc:2685
+#: Merge.rc:2586
#, c-format
msgid "Save the left file with name..."
msgstr "Zapisz lewy plik pod nazw\xB9..."
-#: Merge.rc:2686
+#: Merge.rc:2587
#, c-format
msgid "Save the right file with name..."
msgstr "Zapisz prawy plik pod nazw\xB9..."
-#: Merge.rc:2687
+#: Merge.rc:2588
#, c-format
msgid "Change left side file/folder read-only status"
msgstr "Prze\xB3\xB9cz lew\xB9 stron\xEA/folder na tylko do odczytu"
-#: Merge.rc:2688
+#: Merge.rc:2589
#, c-format
msgid "Change right side file/folder read-only status"
msgstr "Prze\xB3\xB9cz praw\xB9 stron\xEA/folder na tylko do odczytu"
-#: Merge.rc:2689
+#: Merge.rc:2590
#, c-format
msgid "Convert EOL to Windows mode"
msgstr "Konwertuj ZKL na Windows"
-#: Merge.rc:2690
+#: Merge.rc:2591
#, c-format
msgid "Convert EOL to Unix mode"
msgstr "Konwertuj ZKL na Unix"
-#: Merge.rc:2691
+#: Merge.rc:2592
#, c-format
msgid "Convert EOL to Mac mode"
msgstr "Konwertuj ZKL na Mac"
-#: Merge.rc:2692
+#: Merge.rc:2593
#, c-format
msgid "Switch between editing and merging modes"
msgstr "Prze\xB3\xB9cz mi\xEAdzy trybami edycji i scalania"
-#: Merge.rc:2693
+#: Merge.rc:2594
#, c-format
msgid ""
"View and adjust file encoding properties\n"
@@ -5496,12 +5230,12 @@
"Poka\xBF i dostosuj w\xB3a\x9Cciwo\x9Cci kodowania pliku\n"
"W\xB3a\x9Cciwo\x9Cci kodowania pliku"
-#: Merge.rc:2694
+#: Merge.rc:2595
#, c-format
msgid "Open and resolve conflict file"
msgstr "Otw\xF3rz i rozwi\xB9\xBF plik konfliktu"
-#: Merge.rc:2700
+#: Merge.rc:2601
#, c-format
msgid ""
"Select difference area in the current line\n"
@@ -5510,7 +5244,7 @@
"Zaznacz obszar r\xF3\xBFnicy w bie\xBF\xB9cej linii\n"
"R\xF3\xBFnica w bie\xBF\xB9cej linii"
-#: Merge.rc:2701
+#: Merge.rc:2602
#, c-format
msgid ""
"Go to line or difference\n"
@@ -5519,7 +5253,7 @@
"Przejd\x9F do linii lub r\xF3\xBFnicy\n"
"Id\x9F do (Ctrl+G)"
-#: Merge.rc:2702
+#: Merge.rc:2603
#, c-format
msgid ""
"Set program options\n"
@@ -5528,7 +5262,7 @@
"Ustaw opcje programu\n"
"Opcje"
-#: Merge.rc:2703
+#: Merge.rc:2604
#, c-format
msgid ""
"Refresh display\n"
@@ -5537,79 +5271,79 @@
"Od\x9Cwie\xBF podgl\xB9d\n"
"Od\x9Cwie\xBF (F5)"
-#: Merge.rc:2704
+#: Merge.rc:2605
#, c-format
msgid "Copy selected lines to clipboard adding linenumbers to line begin"
msgstr "Kopiuj wybrane linie do schowka dodaj\xB9c numeracj\xEA wierszy"
-#: Merge.rc:2705
+#: Merge.rc:2606
#, c-format
msgid "Refresh selected items"
msgstr "Od\x9Cwie\xBF zaznaczone elementy"
-#: Merge.rc:2706
+#: Merge.rc:2607
#, c-format
msgid "Toggle bookmark"
msgstr "Dodaj zak\xB3adk\xEA"
-#: Merge.rc:2707
+#: Merge.rc:2608
#, c-format
msgid "Go to next bookmark"
msgstr "Id\x9F do nast\xEApnej zak\xB3adki"
-#: Merge.rc:2708
+#: Merge.rc:2609
#, c-format
msgid "Go to previous bookmark"
msgstr "Id\x9F do poprzedniej zak\xB3adki"
-#: Merge.rc:2709
+#: Merge.rc:2610
#, c-format
msgid "Clear all bookmarks"
msgstr "Wyczy\x9C\xE6 wszystkie zak\xB3adki"
-#: Merge.rc:2715
+#: Merge.rc:2616
#, c-format
msgid ""
"Displays items that are exactly the same\n"
"Show Identical Items"
msgstr "Wy\x9Cwietla pliki, kt\xF3re s\xB9 dok\xB3adnie identyczne"
-#: Merge.rc:2716
+#: Merge.rc:2617
#, c-format
msgid ""
"Displays items that have differences\n"
"Show Different Items"
msgstr "Wyswietla pliki z r\xF3\xBFnicami"
-#: Merge.rc:2717
+#: Merge.rc:2618
#, c-format
msgid ""
"Displays items that exist in only on the left side\n"
"Show Left Unique Items"
msgstr "Wyswietla pliki istniej\xB9ce tylko po lewej"
-#: Merge.rc:2718
+#: Merge.rc:2619
#, c-format
msgid ""
"Displays items that exist in only on the right side\n"
"Show Right Unique Items"
msgstr "Wyswietla pliki istniej\xB9ce tylko po prawej"
-#: Merge.rc:2719
+#: Merge.rc:2620
#, c-format
msgid ""
"Displays binary files\n"
"Show Binary Files"
msgstr "Wy\x9Cwietla pliki binarne"
-#: Merge.rc:2720
+#: Merge.rc:2621
#, c-format
msgid ""
"Displays skipped items\n"
"Show Skipped Items"
msgstr "Wy\x9Cwietla pomini\xEAte pliki"
-#: Merge.rc:2726
+#: Merge.rc:2627
#, c-format
msgid ""
"Select the font for the view\n"
@@ -5618,7 +5352,7 @@
"Wybierz czcionk\xEA podgl\xB9du\n"
"Wybierz czcionk\xEA podgl\xB9du"
-#: Merge.rc:2727
+#: Merge.rc:2628
#, c-format
msgid ""
"Revert to using the default system font for view\n"
@@ -5627,27 +5361,27 @@
"Przywr\xF3\xE6 domy\x9Cln\xB9 czcionk\xEA systemow\xB9 podgl\xB9du\n"
"Czcionka domy\x9Clna"
-#: Merge.rc:2728
+#: Merge.rc:2629
#, c-format
msgid "Shows whitespace characters"
msgstr "Pokazuje bia\xB3e znaki"
-#: Merge.rc:2729
+#: Merge.rc:2630
#, c-format
msgid "Toggle Diff Pane"
msgstr "Prze\xB3\xB9cz panel r\xF3\xBFnic"
-#: Merge.rc:2730
+#: Merge.rc:2631
#, c-format
msgid "Location pane shows overall picture from files"
msgstr "Panel pokazuje og\xF3lny obraz z plik\xF3w"
-#: Merge.rc:2731
+#: Merge.rc:2632
#, c-format
msgid "Show folder compare statistics dialog"
msgstr "Poka\xBF okno statystyk por\xF3wnania folderu"
-#: Merge.rc:2732
+#: Merge.rc:2633
#, c-format
msgid ""
"Select the current user interface language\n"
@@ -5656,7 +5390,7 @@
"Wybierz j\xEAzyk interfejsu u\xBFytkownika\n"
"J\xEAzyk"
-#: Merge.rc:2733
+#: Merge.rc:2634
#, c-format
msgid ""
"Shows differences inside lines with different colors\n"
@@ -5665,12 +5399,12 @@
"Pokazuj r\xF3\xBFnice wewn\xB9trz linii r\xF3\xBFnymi kolorami\n"
"Pokazuj r\xF3\xBFnic\xEA linii"
-#: Merge.rc:2734
+#: Merge.rc:2635
#, c-format
msgid "Swap the positions of the two panes"
msgstr "Zamie\xF1 pozycje dw\xF3ch okien"
-#: Merge.rc:2735
+#: Merge.rc:2636
#, c-format
msgid ""
"Shows line numbers\n"
@@ -5679,7 +5413,7 @@
"Poka\xBF numery linii\n"
"Poka\xBF numery linii"
-#: Merge.rc:2736
+#: Merge.rc:2637
#, c-format
msgid ""
"Enable word wrap\n"
@@ -5688,7 +5422,7 @@
"W\xB3\xB9cz zawijanie s\xB3\xF3w\n"
"Zawijaj linie"
-#: Merge.rc:2737
+#: Merge.rc:2638
#, c-format
msgid ""
"Shows selection margins for both panes\n"
@@ -5697,22 +5431,22 @@
"Pokazuje marginesy zaznaczenie dla obu paneli\n"
"Poka\xBF marginesy zaznaczenia"
-#: Merge.rc:2738
+#: Merge.rc:2639
#, c-format
msgid "Increase text size"
msgstr "Zwi\xEAksz rozmiar tekstu"
-#: Merge.rc:2739
+#: Merge.rc:2640
#, c-format
msgid "Decrease text size"
msgstr "Zmniejsz rozmiar tekstu"
-#: Merge.rc:2740
+#: Merge.rc:2641
#, c-format
msgid "Reset text zoom to default size"
msgstr "Resetuj powi\xEAkszenie"
-#: Merge.rc:2746
+#: Merge.rc:2647
#, c-format
msgid ""
"Scroll to the previous difference\n"
@@ -5721,7 +5455,7 @@
"Id\x9F do poprzedniej r\xF3\xBFnicy\n"
"Poprzednia r\xF3\xBFnica (Alt+G\xF3ra)"
-#: Merge.rc:2747
+#: Merge.rc:2648
#, c-format
msgid ""
"Scroll to the next difference\n"
@@ -5730,7 +5464,7 @@
"Id\x9F do nast\xEApnej r\xF3\xBFnicy\n"
"Nast\xEApna r\xF3\xBFnica (Alt+D\xF3\xB3)"
-#: Merge.rc:2748
+#: Merge.rc:2649
#, c-format
msgid ""
"Scroll to the first difference\n"
@@ -5739,7 +5473,7 @@
"Id\x9F do pierwszej r\xF3\xBFnicy\n"
"Pierwsza r\xF3\xBFnica (Alt+Home)"
-#: Merge.rc:2749
+#: Merge.rc:2650
#, c-format
msgid ""
"Scroll to the current difference\n"
@@ -5748,7 +5482,7 @@
"Id\x9F do bie\xBF\xB9cej r\xF3\xBFnicy\n"
"Bie\xBF\xB9ca r\xF3\xBFnica (Alt+Enter)"
-#: Merge.rc:2750
+#: Merge.rc:2651
#, c-format
msgid ""
"Scroll to the last difference\n"
@@ -5757,7 +5491,7 @@
"Id\x9F do ostatnej r\xF3\xBFnicy\n"
"Ostatnia r\xF3\xBFnica (Alt+End)"
-#: Merge.rc:2751
+#: Merge.rc:2652
#, c-format
msgid ""
"Copy the selected text to the right file\n"
@@ -5766,7 +5500,7 @@
"Kopiuj wybrany tekst do prawego pliku\n"
"Kopiuj na prawo (Alt+Prawo)"
-#: Merge.rc:2752
+#: Merge.rc:2653
#, c-format
msgid ""
"Copy the selected text to the left file\n"
@@ -5775,7 +5509,7 @@
"Kopiuj wybrany tekst do lewego pliku\n"
"Kopiuj na lewo (Alt+Lewo)"
-#: Merge.rc:2753
+#: Merge.rc:2654
#, c-format
msgid ""
"Copy difference to right and advance to next\n"
@@ -5784,7 +5518,7 @@
"Kopiuj r\xF3\xBFnic\xEA na prawo i przejd\x9F do nast\xEApnej\n"
"Kopiuj na prawo i nast\xEApna (Ctrl+Alt+Prawo)"
-#: Merge.rc:2754
+#: Merge.rc:2655
#, c-format
msgid ""
"Copy difference to left and advance to next\n"
@@ -5793,7 +5527,7 @@
"Kopiuj r\xF3\xBFnic\xEA na lewo i przejd\x9F do nast\xEApnej\n"
"Kopiuj na lewo i nast\xEApna (Ctrl+Alt+Lewo)"
-#: Merge.rc:2755
+#: Merge.rc:2656
#, c-format
msgid ""
"Copy all differences to the right file\n"
@@ -5802,7 +5536,7 @@
"Kopiuj wszystkie r\xF3\xBFnice do prawego pliku\n"
"Wszystkie na prawo"
-#: Merge.rc:2756
+#: Merge.rc:2657
#, c-format
msgid ""
"Copy all differences to the left file\n"
@@ -5811,77 +5545,77 @@
"Kopiuj wszystkie r\xF3\xBFnice do lewego pliku\n"
"Wszystkie na lewo"
-#: Merge.rc:2757
+#: Merge.rc:2658
#, c-format
msgid "Delete selected items from both directories"
msgstr "Usu\xF1 zaznaczone elementy z obu folder\xF3w"
-#: Merge.rc:2758
+#: Merge.rc:2659
#, c-format
msgid "Compare selected item (compare first item if multiple items selected)"
msgstr "Por\xF3wnaj zaznaczony element (por\xF3wnaj pierwszy element je\x9Cli zaznaczono wiele element\xF3w)"
-#: Merge.rc:2764
+#: Merge.rc:2665
#, c-format
msgid "Select and reorder directory compare columns"
msgstr "Wybierz i ponownie uporz\xB9dkuj kolumny por\xF3wnania katalog\xF3w"
-#: Merge.rc:2765
+#: Merge.rc:2666
#, c-format
msgid "Generate a patch-file"
msgstr "Generuj \xB3atk\xEA"
-#: Merge.rc:2766
+#: Merge.rc:2667
#, c-format
msgid "Select and modify filters"
msgstr "Wybierz i modyfikuj filtry"
-#: Merge.rc:2767
+#: Merge.rc:2668
#, c-format
msgid "Generates a report from compare results"
msgstr "Generuje raport z wynik\xF3w por\xF3wnania"
-#: Merge.rc:2773
+#: Merge.rc:2674
#, c-format
msgid "Shows a list of available plugins"
msgstr "Pokazuje list\xEA dost\xEApnych wtyczek"
-#: Merge.rc:2774
+#: Merge.rc:2675
#, c-format
msgid "The user selects the unpacker (no unpacking when comparing dir)"
msgstr "U\xBFytkownik wybiera program rozpakowuj\xB9cy (bez rozpakowywania podczas por\xF3wnania katalog\xF3w)"
-#: Merge.rc:2775
+#: Merge.rc:2676
#, c-format
msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
msgstr "Program rozpakowuj\xB9cy zostanie uruchomiony dla obu plik\xF3w (jeden plik wymaga rozszerzenia)"
-#: Merge.rc:2776
+#: Merge.rc:2677
#, c-format
msgid "Select an unpacker to edit this file"
msgstr "Wybierz program rozpakowuj\xB9cy, by edytowa\xE6 plik"
-#: Merge.rc:2777
+#: Merge.rc:2678
#, c-format
msgid "No prediffer (normal)"
msgstr "Bez r\xF3\xBFnicowania wst\xEApnego (normalne)"
-#: Merge.rc:2778
+#: Merge.rc:2679
#, c-format
msgid "Suggested plugins"
msgstr "Sugerowane wtyczki"
-#: Merge.rc:2779
+#: Merge.rc:2680
#, c-format
msgid "Other plugins"
msgstr "Inne wtyczki"
-#: Merge.rc:2780
+#: Merge.rc:2681
#, c-format
msgid "Unload all plugins and reload them (for developers)"
msgstr "Od\xB3\xB9cz i ponownie pod\xB3\xB9cz wszystkie wtyczki (dla programist\xF3w)"
-#: Merge.rc:2786
+#: Merge.rc:2687
#, c-format
msgid ""
"Activates next visible file\n"
@@ -5890,12 +5624,12 @@
"Aktywuje nast\xEApny widoczny plik\n"
"Aktywuj nast\xEApny plik"
-#: Merge.rc:2787
+#: Merge.rc:2688
#, c-format
msgid "Closes all open windows"
msgstr "Zamyka wszystkie otwarte okna"
-#: Merge.rc:2793
+#: Merge.rc:2694
#, c-format
msgid ""
"Opens the WinMerge Help\n"
@@ -5904,22 +5638,22 @@
"Otwiera pomoc WinMerge\n"
"Pomoc WinMerge"
-#: Merge.rc:2794
+#: Merge.rc:2695
#, c-format
msgid "Outputs current WinMerge version info and configuration to text file"
msgstr "Wy\x9Cwietla bie\xBF\xB9c\xB9 wersj\xEA WinMerge oraz tekstowy plik konfiguracji"
-#: Merge.rc:2795
+#: Merge.rc:2696
#, c-format
msgid "Display the GNU General Public License"
msgstr "Wy\x9Cwietla licencj\xEA GNU General Public License"
-#: Merge.rc:2796
+#: Merge.rc:2697
#, c-format
msgid "Private Build: %1"
msgstr "Kompilacja prywatna: %1"
-#: Merge.rc:2797
+#: Merge.rc:2698
#, c-format
msgid ""
"Opens the release notes document\n"
@@ -5928,7 +5662,7 @@
"Otwiera dokument z informacjami o wydaniu\n"
"Informacje o wydaniu"
-#: Merge.rc:2798
+#: Merge.rc:2699
#, c-format
msgid ""
"Opens the translations website\n"
@@ -5937,272 +5671,272 @@
"Otwiera witryn\xEA t\xB3umacze\xF1\n"
"T\xB3umacznia"
-#: Merge.rc:2804
+#: Merge.rc:2705
#, c-format
msgid "Plugin Settings"
msgstr "Ustawienia wtyczki"
-#: Merge.rc:2805
+#: Merge.rc:2706
#, c-format
msgid "No prediffer"
msgstr "Bez r\xF3\xBFnicowania wst\xEApnego"
-#: Merge.rc:2806
+#: Merge.rc:2707
#, c-format
msgid "Prediff if possible"
msgstr "R\xF3\xBFnicuj wst\xEApnie, je\x9Cli mo\xBFna"
-#: Merge.rc:2808
+#: Merge.rc:2709
#, c-format
msgid "WSH not found - .sct scripts disabled"
msgstr "Nie znaleziono WSH \x96 skrypty .sct wy\xB3\xB9czone"
-#: Merge.rc:2809
+#: Merge.rc:2710
#, c-format
msgid "<None>"
msgstr "<brak>"
-#: Merge.rc:2810
+#: Merge.rc:2711
#, c-format
msgid "<Automatic>"
msgstr "<automatycznie>"
-#: Merge.rc:2816
+#: Merge.rc:2717
#, c-format
msgid "Open the file with registered application"
msgstr "Otw\xF3rz plik w zarejestrowanej aplikacji"
-#: Merge.rc:2817
+#: Merge.rc:2718
#, c-format
msgid "Open the file with external editor"
msgstr "Otw\xF3rz plik w zewn\xEAtrznym edytorze"
-#: Merge.rc:2818
+#: Merge.rc:2719
#, c-format
msgid "Open the file with a particular program"
msgstr "Otw\xF3rz plik w wybranym programie"
-#: Merge.rc:2824
+#: Merge.rc:2725
#, c-format
msgid "Do not display moved blocks"
msgstr "Nie wy\x9Cwietlaj przenoszonych blok\xF3w"
-#: Merge.rc:2825
+#: Merge.rc:2726
#, c-format
msgid "Display all moved blocks"
msgstr "Wy\x9Cwietl wszystkie przeniesione bloki"
-#: Merge.rc:2826
+#: Merge.rc:2727
#, c-format
msgid "Display moved blocks only from current diff"
msgstr "Wy\x9Cwietl przeniesione bloki tylko od bie\xBF\xB9cej r\xF3\xBFnicy"
-#: Merge.rc:2827
+#: Merge.rc:2728
#, c-format
msgid "Go to diff under cursor"
msgstr "Id\x9F do r\xF3\xBFnicy pod kursorem"
-#: Merge.rc:2828
+#: Merge.rc:2729
#, c-format
msgid "G&oto Diff %1 of %2"
msgstr "Id\x9F &do r\xF3\xBFnicy %1 z %2"
-#: Merge.rc:2829
+#: Merge.rc:2730
#, c-format
msgid "G&oto Line %1"
msgstr "&Id\x9F do linii %1"
-#: Merge.rc:2835
+#: Merge.rc:2736
#, c-format
msgid "Disabled"
msgstr "Wy\xB3\xB9czone"
-#: Merge.rc:2836
+#: Merge.rc:2737
#, c-format
msgid "From file system"
msgstr "Z systemu plik\xF3w"
-#: Merge.rc:2837
+#: Merge.rc:2738
#, c-format
msgid "From MRU list"
msgstr "Z listy MRU"
-#: Merge.rc:2843
+#: Merge.rc:2744
#, c-format
msgid "No Highlighting"
msgstr "Bez pod\x9Cwietlenia"
-#: Merge.rc:2844
+#: Merge.rc:2745
#, c-format
msgid "ASP"
msgstr "ASP"
-#: Merge.rc:2845
+#: Merge.rc:2746
#, c-format
msgid "Basic"
msgstr "Basic"
-#: Merge.rc:2846
+#: Merge.rc:2747
#, c-format
msgid "Batch"
msgstr "Batch"
-#: Merge.rc:2847
+#: Merge.rc:2748
#, c-format
msgid "C/C++"
msgstr "C/C++"
-#: Merge.rc:2848
+#: Merge.rc:2749
#, c-format
msgid "C#"
msgstr "C#"
-#: Merge.rc:2849
+#: Merge.rc:2750
#, c-format
msgid "CSS"
msgstr "CSS"
-#: Merge.rc:2850
+#: Merge.rc:2751
#, c-format
msgid "DCL"
msgstr "DCL"
-#: Merge.rc:2851
+#: Merge.rc:2752
#, c-format
msgid "Fortran"
msgstr "Fortran"
-#: Merge.rc:2852
+#: Merge.rc:2753
#, c-format
msgid "HTML"
msgstr "HTML"
-#: Merge.rc:2853
+#: Merge.rc:2754
#, c-format
msgid "INI"
msgstr "INI"
-#: Merge.rc:2854
+#: Merge.rc:2755
#, c-format
msgid "InnoSetup"
msgstr "InnoSetup"
-#: Merge.rc:2855
+#: Merge.rc:2756
#, c-format
msgid "InstallShield"
msgstr "InstallShield"
-#: Merge.rc:2856
+#: Merge.rc:2757
#, c-format
msgid "Java"
msgstr "Java"
-#: Merge.rc:2857
+#: Merge.rc:2758
#, c-format
msgid "AutoLISP"
msgstr "AutoLISP"
-#: Merge.rc:2858
+#: Merge.rc:2759
#, c-format
msgid "NSIS"
msgstr "NSIS"
-#: Merge.rc:2859
+#: Merge.rc:2760
#, c-format
msgid "Pascal"
msgstr "Pascal"
-#: Merge.rc:2860
+#: Merge.rc:2761
#, c-format
msgid "Perl"
msgstr "Perl"
-#: Merge.rc:2861
+#: Merge.rc:2762
#, c-format
msgid "PHP"
msgstr "PHP"
-#: Merge.rc:2862
+#: Merge.rc:2763
#, c-format
msgid "Portable Object"
msgstr "Portable Object"
-#: Merge.rc:2863
+#: Merge.rc:2764
#, c-format
msgid "PowerShell"
msgstr "PowerShell"
-#: Merge.rc:2864
+#: Merge.rc:2765
#, c-format
msgid "Python"
msgstr "Python"
-#: Merge.rc:2865
+#: Merge.rc:2766
#, c-format
msgid "REXX"
msgstr "REXX"
-#: Merge.rc:2866
+#: Merge.rc:2767
#, c-format
msgid "Resources"
msgstr "Zasoby"
-#: Merge.rc:2867
+#: Merge.rc:2768
#, c-format
msgid "Ruby"
msgstr "Ruby"
-#: Merge.rc:2868
+#: Merge.rc:2769
#, c-format
msgid "SGML"
msgstr "SGML"
-#: Merge.rc:2869
+#: Merge.rc:2770
#, c-format
msgid "Shell"
msgstr "Shell"
-#: Merge.rc:2870
+#: Merge.rc:2771
#, c-format
msgid "SIOD"
msgstr "SIOD"
-#: Merge.rc:2871
+#: Merge.rc:2772
#, c-format
msgid "SQL"
msgstr "SQL"
-#: Merge.rc:2872
+#: Merge.rc:2773
#, c-format
msgid "TCL"
msgstr "TCL"
-#: Merge.rc:2873
+#: Merge.rc:2774
#, c-format
msgid "TEX"
msgstr "TEX"
-#: Merge.rc:2874
+#: Merge.rc:2775
#, c-format
msgid "Verilog"
msgstr "Verilog"
-#: Merge.rc:2875
+#: Merge.rc:2776
#, c-format
msgid "XML"
msgstr "XML"
-#: Merge.rc:2880
+#: Merge.rc:2781
#, c-format
msgid "Hide the toolbar"
msgstr "Ukryj pasek narz\xEAdzi"
-#: Merge.rc:2881
+#: Merge.rc:2782
#, c-format
msgid "Show small toolbar"
msgstr "Poka\xBF ma\xB3y pasek narz\xEAdzi"
-#: Merge.rc:2882
+#: Merge.rc:2783
#, c-format
msgid "Show big toolbar"
msgstr "Poka\xBF du\xBFy pasek narz\xEAdzi"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-02-19 19:04:05
|
Revision: 7123
http://winmerge.svn.sourceforge.net/winmerge/?rev=7123&view=rev
Author: gerundt
Date: 2010-02-19 19:03:56 +0000 (Fri, 19 Feb 2010)
Log Message:
-----------
PATCH: [ 2954833 ] Traditional Chinese Language File updated
Submitted by wck3
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Translations/WinMerge/ChineseTraditional.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-02-12 16:47:48 UTC (rev 7122)
+++ trunk/Docs/Users/ChangeLog.txt 2010-02-19 19:03:56 UTC (rev 7123)
@@ -5,6 +5,7 @@
WinMerge 2.13.12
Translation updates:
+ - Chinese Traditional (#2954833)
- Slovenian (#2934354)
- Swedish (#2943964)
Modified: trunk/Translations/WinMerge/ChineseTraditional.po
===================================================================
--- trunk/Translations/WinMerge/ChineseTraditional.po 2010-02-12 16:47:48 UTC (rev 7122)
+++ trunk/Translations/WinMerge/ChineseTraditional.po 2010-02-19 19:03:56 UTC (rev 7123)
@@ -12,9 +12,9 @@
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2009-01-15 20:39+0000\n"
-"PO-Revision-Date: 2009-01-27 19:11+0800\n"
-"Last-Translator: wck <wc...@pc...>\n"
+"POT-Creation-Date: 2009-11-08 13:51+0000\n"
+"PO-Revision-Date: 2010-02-19 17:04+0800\n"
+"Last-Translator: wck3 <wc...@pc...>\n"
"Language-Team: ChineseTraditional <win...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CP950\n"
@@ -291,12 +291,12 @@
#: Merge.rc:152
#, c-format
msgid "Ma&nual Prediffer"
-msgstr ""
+msgstr "\xA4\xE2\xB0ʥ\xFD\xA6\xE6\xB3B\xB2z\xBE\xB9(&N)"
#: Merge.rc:153
#, c-format
msgid "A&utomatic Prediffer"
-msgstr ""
+msgstr "\xA6۰ʥ\xFD\xA6\xE6\xB3B\xB2z\xBE\xB9(&U)"
# "\xA4\xE2\xB0ʸ\xD1\xC0\xA3\xC1Y(&M)"
#: Merge.rc:155
@@ -402,7 +402,7 @@
#: Merge.rc:178
#: Merge.rc:299
#: Merge.rc:487
-#: Merge.rc:1947
+#: Merge.rc:1948
#, c-format
msgid "&Help"
msgstr "\xBB\xA1\xA9\xFA(&H)"
@@ -733,7 +733,7 @@
msgstr "\xC0HĶ\xA7Y\xA6\xE6\xBDX(&S)"
#: Merge.rc:373
-#: Merge.rc:2803
+#: Merge.rc:2708
#, c-format
msgid "< Empty >"
msgstr "< \xB5L >"
@@ -940,14 +940,14 @@
#: Merge.rc:526
#: Merge.rc:1147
-#: Merge.rc:1531
+#: Merge.rc:1514
#, c-format
msgid "&Left"
msgstr "\xA5\xAA\xC3\xE4(&L)"
#: Merge.rc:527
#: Merge.rc:1149
-#: Merge.rc:1534
+#: Merge.rc:1517
#, c-format
msgid "&Right"
msgstr "\xA5k\xC3\xE4(&R)"
@@ -1104,12 +1104,12 @@
#: Merge.rc:1066
#: Merge.rc:1095
#: Merge.rc:1105
-#: Merge.rc:1273
-#: Merge.rc:1337
-#: Merge.rc:1350
-#: Merge.rc:1442
-#: Merge.rc:1457
-#: Merge.rc:1679
+#: Merge.rc:1256
+#: Merge.rc:1320
+#: Merge.rc:1333
+#: Merge.rc:1425
+#: Merge.rc:1440
+#: Merge.rc:1662
#, c-format
msgid "OK"
msgstr "\xBDT\xA9w"
@@ -1125,7 +1125,7 @@
msgstr "\xBF\xEF\xA8\xFA\xC0ɮשθ\xEA\xAEƧ\xA8"
#: Merge.rc:690
-#: Merge.rc:1608
+#: Merge.rc:1591
#, c-format
msgid "&Left:"
msgstr "\xA5\xAA\xC3\xE4(&L)\xA1G"
@@ -1139,7 +1139,7 @@
msgstr "\xC2s\xC4\xFD(&B)..."
#: Merge.rc:695
-#: Merge.rc:1612
+#: Merge.rc:1595
#, c-format
msgid "&Right:"
msgstr "\xA5k\xC3\xE4(&R)\xA1G"
@@ -1151,13 +1151,13 @@
msgstr "\xC2s\xC4\xFD(&W)..."
#: Merge.rc:700
-#: Merge.rc:1616
+#: Merge.rc:1599
#, c-format
msgid "&Filter:"
msgstr "\xBFz\xBFﾹ(&F)\xA1G"
#: Merge.rc:703
-#: Merge.rc:1618
+#: Merge.rc:1601
#, c-format
msgid "Select..."
msgstr "\xBF\xEF\xA8\xFA..."
@@ -1173,7 +1173,7 @@
msgstr "\xBF\xEF\xA8\xFA(&S)..."
#: Merge.rc:708
-#: Merge.rc:1619
+#: Merge.rc:1602
#, c-format
msgid "&Include Subfolders"
msgstr "\xA5]\xACA\xA4l\xB8\xEA\xAEƧ\xA8(&I)"
@@ -1193,17 +1193,17 @@
#: Merge.rc:1096
#: Merge.rc:1106
#: Merge.rc:1157
-#: Merge.rc:1274
-#: Merge.rc:1351
-#: Merge.rc:1443
-#: Merge.rc:1458
-#: Merge.rc:1680
+#: Merge.rc:1257
+#: Merge.rc:1334
+#: Merge.rc:1426
+#: Merge.rc:1441
+#: Merge.rc:1663
#, c-format
msgid "Cancel"
msgstr "\xA8\xFA\xAE\xF8"
#: Merge.rc:713
-#: Merge.rc:1352
+#: Merge.rc:1335
#, c-format
msgid "Help"
msgstr "\xBB\xA1\xA9\xFA"
@@ -1271,13 +1271,14 @@
msgstr "\xAA\xA9\xA5\xBB\xBAz\xA8t\xB2\xCE(&V)\xA1G"
#: Merge.rc:753
-#: Merge.rc:2079
+#: Merge.rc:2083
#, c-format
msgid "&Path to cleartool.exe:"
msgstr "cleartool.exe \xB8\xF4\xAE|(&P)\xA1G"
#: Merge.rc:760
-#: Merge.rc:1955
+#: Merge.rc:1956
+#: Merge.rc:1969
#, c-format
msgid "General"
msgstr "\xA4@\xAF\xEB"
@@ -1335,13 +1336,13 @@
msgstr "\xB1ҥΦh\xAD\xAB\xA4\xF1\xB8\xFB\xB5\xF8\xB5\xA1"
#: Merge.rc:787
-#: Merge.rc:1631
+#: Merge.rc:1614
#, c-format
msgid "&Folder compare"
msgstr "\xA4\xF1\xB8\xFB\xB8\xEA\xAEƧ\xA8\xAE\xC9(&F)"
#: Merge.rc:789
-#: Merge.rc:1633
+#: Merge.rc:1616
#, c-format
msgid "Fil&e compare"
msgstr "\xA4\xF1\xB8\xFB\xC0ɮ\xC9(&E)"
@@ -1462,7 +1463,7 @@
msgstr "\xA5\xFE\xB3\xA1\xA8\xFA\xA5N(&A)"
#: Merge.rc:872
-#: Merge.rc:2201
+#: Merge.rc:2205
#, c-format
msgid "Rational ClearCase"
msgstr "Rational ClearCase"
@@ -1473,7 +1474,7 @@
msgstr "\xB0e\xA6^\xA7\xEF\xB9L\xC0\xC9"
#: Merge.rc:880
-#: Merge.rc:1191
+#: Merge.rc:1175
#, c-format
msgid "Comments"
msgstr "\xB3Ƶ\xF9"
@@ -1519,7 +1520,7 @@
msgstr "\xB2\xBE\xB0\xA3"
#: Merge.rc:910
-#: Merge.rc:1958
+#: Merge.rc:1959
#, c-format
msgid "Colors"
msgstr "\xA6\xE2\xB1m"
@@ -1535,7 +1536,7 @@
msgstr "\xA4w\xBF\xEF\xA8\xFA\xAA\xBA\xAC۲\xA7\xB0϶\xF4\xA1G"
#: Merge.rc:921
-#: Merge.rc:1583
+#: Merge.rc:1566
#, c-format
msgid "Background"
msgstr "\xADI\xB4\xBA"
@@ -1546,8 +1547,9 @@
msgstr "\xA4w\xA7R\xB0\xA3"
#: Merge.rc:935
-#: Merge.rc:1378
-#: Merge.rc:1584
+#: Merge.rc:1361
+#: Merge.rc:1567
+#: Merge.rc:1960
#, c-format
msgid "Text"
msgstr "\xABe\xB4\xBA\xA4\xE5"
@@ -1575,26 +1577,27 @@
#: Merge.rc:976
#, c-format
msgid "Selected Word Diff:"
-msgstr "\xA4w\xBF\xEF\xA8\xFA\xAA\xBA\xA6r\xAC۲\xA7\xA1G"
+msgstr "\xA4w\xBF\xEF\xA8\xFA\xAA\xBA\xA6r\xAA\xBA\xAC۲\xA7\xA1G"
#: Merge.rc:986
#: Merge.rc:1065
#: Merge.rc:1094
-#: Merge.rc:1194
-#: Merge.rc:1424
+#: Merge.rc:1177
+#: Merge.rc:1407
+#: Merge.rc:1699
#, c-format
msgid "Defaults"
msgstr "\xB9w\xB3]\xAD\xC8"
#: Merge.rc:992
-#: Merge.rc:1366
-#: Merge.rc:1572
+#: Merge.rc:1349
+#: Merge.rc:1555
#, c-format
msgid "Dialog"
msgstr "\xB9\xEF\xB8\xDC"
#: Merge.rc:1002
-#: Merge.rc:1961
+#: Merge.rc:1962
#, c-format
msgid "System"
msgstr "\xA8t\xB2\xCE"
@@ -1771,7 +1774,7 @@
msgstr "\xA4\xF1\xB8\xFB\xB8\xEA\xAEƧ\xA8\xA4\xA4"
#: Merge.rc:1128
-#: Merge.rc:1908
+#: Merge.rc:1909
#, c-format
msgid "Stop"
msgstr "\xB0\xB1\xA4\xEE"
@@ -1827,7 +1830,7 @@
msgstr "\xB2\xBE\xA6\xDC(&G)"
#: Merge.rc:1162
-#: Merge.rc:1956
+#: Merge.rc:1957
#, c-format
msgid "Compare"
msgstr "\xA4\xF1\xB8\xFB"
@@ -1842,215 +1845,200 @@
msgid "&Compare"
msgstr "\xA4\xF1\xB9\xEF\xAAťճB(&W)"
-#: Merge.rc:1168
+#: Merge.rc:1167
#, c-format
msgid "&Ignore change"
msgstr "\xA9\xBF\xB2\xA4\xAAťռƶq\xA4\xA7\xC5ܰʦӳy\xA6\xA8\xAA\xBA\xAEt\xB2\xA7(&H)"
-#: Merge.rc:1170
+#: Merge.rc:1168
#, c-format
msgid "I&gnore all"
msgstr "\xA9\xBF\xB2\xA4\xAAťճB\xA4\xA7\xA5\xF4\xA6\xF3\xAEt\xB2\xA7(&A)"
-#: Merge.rc:1172
+#: Merge.rc:1169
#, c-format
msgid "Ignore blan&k lines"
msgstr "\xA9\xBF\xB2\xA4\xAAťզ\xE6(&K)"
-#: Merge.rc:1174
+#: Merge.rc:1170
#, c-format
msgid "Ignore &case"
msgstr "\xA9\xBF\xB2\xA4\xA4j\xA4p\xBCg(&C)"
-#: Merge.rc:1176
+#: Merge.rc:1171
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgstr "\xA9\xBF\xB2\xA4\xB4\xAB\xA6\xE6\xA6r\xA4\xB8\xA4\xA7\xAEt\xB2\xA7(Windows/Unix/Mac)(&R)"
-#: Merge.rc:1179
+#: Merge.rc:1173
#, c-format
msgid "E&nable moved block detection"
msgstr "\xB0\xBB\xB4\xFA\xB2\xBE\xA6쪺\xB0϶\xF4(&N)"
-#: Merge.rc:1181
+#: Merge.rc:1174
#, c-format
msgid "&Match similar lines"
msgstr "\xA7\xE4\xA5X\xACۦ\xFC\xA6\xE6(&M)"
-#: Merge.rc:1183
+#: Merge.rc:1176
#, c-format
-msgid "Ign&ore time differences less than 3 seconds"
-msgstr "\xA6p\xA8\xE2\xC0ɮפ\xA7\xADק\xEF\xAEɶ\xA1\xB6\xA1\xB9j\xA4֩\xF3\xA4T\xAC\xED\xA1A\xABh\xA9\xBF\xB2\xA4\xA6\xB9\xAEt\xB2\xA7(&O)"
-
-#: Merge.rc:1186
-#, c-format
-msgid "&File Compare method:"
-msgstr "\xC0ɮפ\xF1\xB8\xFB\xA4覡(&F)\xA1G"
-
-#: Merge.rc:1189
-#, c-format
-msgid "S&top after first difference"
-msgstr "\xB2Ĥ@\xADӮt\xB2\xA7\xB4N\xB0\xB1(&T)"
-
-#: Merge.rc:1192
-#, c-format
msgid "Filter Comments"
msgstr "\xBFz\xBFﾹ\xA4\xA7\xB5\xF9"
-#: Merge.rc:1199
-#: Merge.rc:1957
+#: Merge.rc:1182
+#: Merge.rc:1958
#, c-format
msgid "Editor"
msgstr "\xBDs\xBF边"
-#: Merge.rc:1202
+#: Merge.rc:1185
#, c-format
msgid "&Highlight syntax"
msgstr "\xB0\xAA\xABG\xABy\xAAk(&H)"
-#: Merge.rc:1204
+#: Merge.rc:1187
#, c-format
msgid "&Automatic rescan"
msgstr "\xA6۰ʭ\xAB\xB7s\xB1\xBD\xB4y(&A)"
-#: Merge.rc:1206
+#: Merge.rc:1189
#, c-format
msgid "&Preserve original EOL chars"
msgstr "\xABO\xAFd\xAD\xEC\xA9l EOL \xA6r\xA4\xB8(&P)"
-#: Merge.rc:1208
+#: Merge.rc:1191
#, c-format
msgid "Tabs"
msgstr "\xB8\xF5\xAE\xE6"
-#: Merge.rc:1209
+#: Merge.rc:1192
#, c-format
msgid "&Tab size:"
msgstr "\xB8\xF5\xAE\xE6\xA4j\xA4p(&T)\xA1G"
-#: Merge.rc:1212
+#: Merge.rc:1195
#, c-format
msgid "&Insert Tabs"
msgstr "\xB4\xA1\xA4J\xB8\xF5\xAE\xE6\xA6r\xA4\xB8(&I)"
-#: Merge.rc:1214
+#: Merge.rc:1197
#, c-format
msgid "Insert &Spaces"
msgstr "\xB4\xA1\xA4J\xAAť\xD5(&S)"
-#: Merge.rc:1216
+#: Merge.rc:1199
#, c-format
msgid "Line Difference Coloring"
msgstr "\xA6椺\xAEt\xB2\xA7\xB5ۦ\xE2"
-#: Merge.rc:1218
+#: Merge.rc:1201
#, c-format
msgid "View line differences"
msgstr "\xC0˵\xF8\xA6椺\xAEt\xB2\xA7"
-#: Merge.rc:1220
+#: Merge.rc:1203
#, c-format
msgid "&Character level"
msgstr "\xA6r\xA4\xB8\xB6\xA5\xBCh(&C)"
-#: Merge.rc:1222
+#: Merge.rc:1205
#, c-format
msgid "&Word-level:"
msgstr "\xA6r\xB6\xA5\xBCh(&W)\xA1G"
-#: Merge.rc:1226
+#: Merge.rc:1209
#, c-format
msgid "W&ord break characters:"
-msgstr ""
+msgstr "\xC2_\xA5y\xA6r\xA4\xB8(&O)\xA1G"
-#: Merge.rc:1239
+#: Merge.rc:1222
#, c-format
msgid "Filefilters"
msgstr "\xC0ɮz\xBFﾹ"
-#: Merge.rc:1245
+#: Merge.rc:1228
#, c-format
msgid "Test"
msgstr "\xB4\xFA\xB8\xD5"
-#: Merge.rc:1246
+#: Merge.rc:1229
#, c-format
msgid "Install..."
msgstr "\xA6w\xB8\xCB..."
-#: Merge.rc:1247
+#: Merge.rc:1230
#, c-format
msgid "New..."
msgstr "\xB7s\xBCW..."
-#: Merge.rc:1248
+#: Merge.rc:1231
#, c-format
msgid "Edit..."
msgstr "\xBDs\xBF\xE8..."
-#: Merge.rc:1249
+#: Merge.rc:1232
#, c-format
msgid "Delete..."
msgstr "\xA7R\xB0\xA3..."
-#: Merge.rc:1255
+#: Merge.rc:1238
#, c-format
msgid "Save modified files?"
msgstr "\xC0x\xA6s\xADק諸\xC0ɮסH"
-#: Merge.rc:1258
+#: Merge.rc:1241
#, c-format
msgid "Left side file"
msgstr "\xA5\xAA\xC3\xE4\xC0ɮ\xD7"
-#: Merge.rc:1261
+#: Merge.rc:1244
#, c-format
msgid "&Save changes"
msgstr "\xC0x\xA6s\xC5ܧ\xF3(&S)"
-#: Merge.rc:1263
+#: Merge.rc:1246
#, c-format
msgid "&Discard changes"
msgstr "\xA9\xF1\xB1\xF3\xC5ܧ\xF3(&D)"
-#: Merge.rc:1265
+#: Merge.rc:1248
#, c-format
msgid "Right side file"
msgstr "\xA5k\xC3\xE4\xC0ɮ\xD7"
-#: Merge.rc:1268
+#: Merge.rc:1251
#, c-format
msgid "S&ave changes"
msgstr "\xC0x\xA6s\xC5ܧ\xF3(&A)"
-#: Merge.rc:1270
+#: Merge.rc:1253
#, c-format
msgid "Dis&card changes"
msgstr "\xA9\xF1\xB1\xF3\xC5ܧ\xF3(&C)"
-#: Merge.rc:1272
+#: Merge.rc:1255
#, c-format
msgid "Disca&rd All"
-msgstr ""
+msgstr "\xA9\xF1\xB1\xF3\xA5\xFE\xB3\xA1(&R)"
-#: Merge.rc:1279
-#: Merge.rc:1527
-#: Merge.rc:1963
+#: Merge.rc:1262
+#: Merge.rc:1510
+#: Merge.rc:1964
#, c-format
msgid "Codepage"
msgstr "\xBDs\xBDX\xAD\xB6"
-#: Merge.rc:1282
+#: Merge.rc:1265
#, c-format
msgid "Default Codepage"
msgstr "\xBDs\xBDX\xAD\xB6"
-#: Merge.rc:1283
+#: Merge.rc:1266
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr "\xA9\xF3\xB8\xFC\xA4J non-unicode \xC0ɮɧ\xEF\xC5ܩҥΪ\xBA\xBDs\xBDX\xAD\xB6\xA6\xA8"
-#: Merge.rc:1285
+#: Merge.rc:1268
#, c-format
msgid ""
"Detect codepage info for these files: .html, .rc, .xml \n"
@@ -2059,32 +2047,32 @@
"\xB0\xBB\xB4\xFA\xAB᭱\xC0ɮת\xBA\xBDs\xBDX\xAD\xB6\xB8\xEA\xB0T\xA1G.html, .rc, .xml \n"
"\xAD\xAB\xB1Ұʫ\xE1\xA4~\xB0\xBB\xB4\xFA"
-#: Merge.rc:1288
+#: Merge.rc:1271
#, c-format
msgid "System codepage"
msgstr "\xA8t\xB2ΥΪ\xBA\xBDs\xBDX\xAD\xB6"
-#: Merge.rc:1290
+#: Merge.rc:1273
#, c-format
msgid "According to WinMerge User Interface"
msgstr "WinMerge \xA8ϥΪ̤\xB6\xAD\xB1\xA5Ϊ\xBA\xBDs\xBDX\xAD\xB6"
-#: Merge.rc:1292
+#: Merge.rc:1275
#, c-format
msgid "Custom codepage:"
msgstr "\xA6ۭq\xBDs\xBDX\xAD\xB6\xA1G"
-#: Merge.rc:1300
+#: Merge.rc:1283
#, c-format
msgid "WinMerge - Archive support disabled"
msgstr "WinMerge - \xA4w\xC3\xF6\xB3\xAC\xC0\xA3\xC1Y\xC0ɤ䴩"
-#: Merge.rc:1303
+#: Merge.rc:1286
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr "\xB5L\xAAk\xB4\xFA\xAA\xBE 7-Zip \xAA\xA9\xA5\xBB(\xA8S\xA6w\xB8\xCB 7-Zip \xB6ܡH)"
-#: Merge.rc:1306
+#: Merge.rc:1289
#, c-format
msgid ""
"Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
@@ -2093,12 +2081,12 @@
"\xA5\xB2\xB6\xB7\xA6w\xB8\xCB 7-Zip 3.11 \xA9Χ\xF3\xB1ߪ\xBA\xAA\xA9\xA5\xBB\xA9\xF3\xA7A\xAA\xBA\xB9q\xB8\xA3\xA1A\n"
"\xA9Ψ\xE4\xAE֤ߤ\xB8\xA5\xF3\xA4w\xB3Q\xBDƻs\xA8\xEC\xB5{\xA6\xA1\xA5ؿ\xFD\xA1F"
-#: Merge.rc:1308
+#: Merge.rc:1291
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr "\xC1٥\xB2\xB6\xB7\xA6b\xB8\xF4\xB8g\xA4W\xA6\xB3\xBEA\xB7\x{D936}\xAD\xB1\xA5~\xB1\xBE(Merge7z*.dll)\xA1A\xA4~\xAF\xE0\xA4䴩\xC0\xA3\xC1Y\xA1C"
-#: Merge.rc:1310
+#: Merge.rc:1293
#, c-format
msgid ""
"Please use the version of 7-Zip recommended below until interface plugins for later\n"
@@ -2108,13 +2096,13 @@
"7-Zip \xA4\xB6\xAD\xB1\xA5~\xB1\xBE\xAA\xA9\xA5\xBB\xA1C"
# I suggest "7-Zip Version" instead.
-#: Merge.rc:1312
+#: Merge.rc:1295
#, c-format
msgid "Version"
msgstr "7-Zip \xAA\xA9\xA5\xBB"
# I suggest "Required Interface-Plugin" instead.
-#: Merge.rc:1314
+#: Merge.rc:1297
#, c-format
msgid ""
"Plugin required\n"
@@ -2123,56 +2111,56 @@
"\xB8Ӫ\xA9\xA9ҭn\xAA\xBA\xA4\xB6\xAD\xB1\xA5~\xB1\xBE\n"
"(dllbuild %04u)"
-#: Merge.rc:1316
+#: Merge.rc:1299
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr "\xB1\xC0\xC2˪\xBA 7-Zip \xAA\xA9\xA5\xBB\xA1G"
-#: Merge.rc:1319
-#: Merge.rc:1322
+#: Merge.rc:1302
+#: Merge.rc:1305
#, c-format
msgid "present"
msgstr "\xA6s\xA6b"
-#: Merge.rc:1320
+#: Merge.rc:1303
#, c-format
msgid "Merge7z000U.dll"
msgstr "Merge7z000U.dll"
-#: Merge.rc:1323
+#: Merge.rc:1306
#, c-format
msgid "7-Zip software installed on your computer:"
msgstr "\xA4w\xA6w\xB8˩\xF3\xA7A\xAA\xBA\xB9q\xB8\xA3\xAA\xBA\xBFW\xA5\xDF 7-Zip \xB3n\xC5\xE9\xA1G"
-#: Merge.rc:1325
-#: Merge.rc:1330
+#: Merge.rc:1308
+#: Merge.rc:1313
#, c-format
msgid "none"
msgstr "\xB5L"
-#: Merge.rc:1327
+#: Merge.rc:1310
#, c-format
msgid "missing"
msgstr "\xA4\xA3\xA6s\xA6b"
# I suggest "7-Zip components only for WinMerge:" instead.
-#: Merge.rc:1328
+#: Merge.rc:1311
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr "WinMerge \xA4\xBA\xA5Ϊ\xBA 7-Zip \xAE֤ߤ\xB8\xA5\xF3\xA1G"
-#: Merge.rc:1332
+#: Merge.rc:1315
#, c-format
msgid "outdated"
msgstr "\xA4w\xC2\xC2"
# I suggest "Interface-Plugin on path:" instead.
-#: Merge.rc:1333
+#: Merge.rc:1316
#, c-format
msgid "Plugins on path:"
msgstr "\xB8\xF4\xAE|\xA4W\xAA\xBA\xA4\xB6\xAD\xB1\xA5~\xB1\xBE\xA1G"
-#: Merge.rc:1334
+#: Merge.rc:1317
#, c-format
msgid ""
"Don't display this &message again.\n"
@@ -2182,541 +2170,574 @@
"(\xA4\xB4\xA5i\xA5ѻ\xA1\xA9\xFA\xBF\xEF\xB3椤\xA5s\xA5X\xA5\xA6)"
# I suggest Interface-Plugin Download" instead.
-#: Merge.rc:1338
+#: Merge.rc:1321
#, c-format
msgid "Plugin Download"
msgstr "\xA4\xB6\xAD\xB1\xA5~\xB1\xBE\xA4U\xB8\xFC"
-#: Merge.rc:1347
+#: Merge.rc:1330
#, c-format
msgid "Options"
msgstr "\xBFﶵ"
-#: Merge.rc:1358
+#: Merge.rc:1341
#, c-format
msgid " Categories"
msgstr "\xBA\xD8\xC3\xFE"
-#: Merge.rc:1360
+#: Merge.rc:1343
#, c-format
msgid "Import..."
msgstr "\xB6פJ..."
-#: Merge.rc:1361
+#: Merge.rc:1344
#, c-format
msgid "Export..."
msgstr "\xB6ץX..."
-#: Merge.rc:1369
+#: Merge.rc:1352
#, c-format
msgid "Keywords:"
msgstr "\xC3\xF6\xC1\xE4\xA6r\xA1G"
-#: Merge.rc:1370
+#: Merge.rc:1353
#, c-format
msgid "Function names:"
msgstr "\xA8\xE7\xBCƦW\xA1G"
-#: Merge.rc:1371
+#: Merge.rc:1354
#, c-format
msgid "Comments:"
msgstr "\xB5\xF9\xA1G"
-#: Merge.rc:1372
+#: Merge.rc:1355
#, c-format
msgid "Numbers:"
msgstr "\xBCơG"
-#: Merge.rc:1373
+#: Merge.rc:1356
#, c-format
msgid "Operators:"
msgstr "\xB9B\xBA\xE2\xA4l\xA1G"
-#: Merge.rc:1374
+#: Merge.rc:1357
#, c-format
msgid "Strings:"
msgstr "\xA6r\xA6\xEA\xA1G"
-#: Merge.rc:1375
+# What is preprocessor? Is it prediffer? The term "preprocessor" cannot be found elsewhere.
+#: Merge.rc:1358
#, c-format
msgid "Preprocessor:"
msgstr "\xABe\xB3B\xB2z\xBE\xB9\xA1G"
-#: Merge.rc:1376
+#: Merge.rc:1359
#, c-format
msgid "User 1:"
msgstr "\xA8ϥΪ\xCC 1\xA1G"
-#: Merge.rc:1377
+#: Merge.rc:1360
#, c-format
msgid "User 2:"
msgstr "\xA8ϥΪ\xCC 2\xA1G"
-#: Merge.rc:1382
-#: Merge.rc:1387
-#: Merge.rc:1392
-#: Merge.rc:1397
-#: Merge.rc:1402
-#: Merge.rc:1407
-#: Merge.rc:1412
-#: Merge.rc:1417
-#: Merge.rc:1422
+#: Merge.rc:1365
+#: Merge.rc:1370
+#: Merge.rc:1375
+#: Merge.rc:1380
+#: Merge.rc:1385
+#: Merge.rc:1390
+#: Merge.rc:1395
+#: Merge.rc:1400
+#: Merge.rc:1405
#, c-format
msgid "Bold"
msgstr "\xB2\xCA\xC5\xE9"
-#: Merge.rc:1430
+#: Merge.rc:1413
#, c-format
msgid "Folder Compare Report"
msgstr "\xA4\xF1\xB8\xFB\xA5ؿ\xFD\xAB᪺\xB3\xF8\xA7i"
-#: Merge.rc:1433
+#: Merge.rc:1416
#, c-format
msgid "Report &File:"
msgstr "\xB3\xF8\xA7i\xC0\xC9(&F)\xA1G"
-#: Merge.rc:1436
-#: Merge.rc:1610
-#: Merge.rc:1614
-#: Merge.rc:1641
+#: Merge.rc:1419
+#: Merge.rc:1593
+#: Merge.rc:1597
+#: Merge.rc:1624
#, c-format
msgid "Browse..."
msgstr "\xC2s\xC4\xFD..."
-#: Merge.rc:1437
+#: Merge.rc:1420
#, c-format
msgid "&Style:"
msgstr "\xBC˦\xA1(&S)\xA1G"
-#: Merge.rc:1440
+#: Merge.rc:1423
#, c-format
msgid "&Copy to Clipboard"
msgstr "\xBDƻs\xA8\xEC\xB0ŶKï(&C)"
-#: Merge.rc:1448
+#: Merge.rc:1431
#, c-format
msgid "Shared or Private Filter"
msgstr "\xA6@\xA5ΩέӤH\xBFz\xBFﾹ"
-#: Merge.rc:1451
+#: Merge.rc:1434
#, c-format
msgid "Which type of filter do you want to create?"
msgstr "\xA7A\xADn\xABإ߭\xFE\xBAؿz\xBFﾹ\xA1H"
-#: Merge.rc:1453
+#: Merge.rc:1436
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr "\xA6@\xA5οz\xBFﾹ(\xBEA\xA5ΩҦ\xB3\xA8ϥΪ\xCC)"
-#: Merge.rc:1455
+#: Merge.rc:1438
#, c-format
msgid "Private Filter (only for current user)"
msgstr "\xADӤH\xBFz\xBFﾹ(\xB6ȾA\xA5β{\xA6b\xA8ϥΪ\xCC)"
-#: Merge.rc:1463
-#: Merge.rc:1964
+#: Merge.rc:1446
+#: Merge.rc:1965
#, c-format
msgid "Archive Support"
msgstr "\xA4䴩\xC0\xA3\xC1Y"
# \xA1u\xA5H shared installation \xA6w\xB8\xCB7-Zip \xA5~\xB1\xBE\xA4~\xA6\xB3\xA4䴩\xC0\xA3\xC1Y\xA4\xA7\xB1\xF8\xA5\xF3\xA1G\xA1v\xA1u\xA5\xB2\xB6\xB7\xA5\xFD\xA6w\xB8\xCB 7-Zip \xA5~\xB1\xBE\xA1A\xA4~\xA4䴩\xC0\xA3\xC1Y\xA1G\xA1v
# I suggest "The following options shall be invalid without 7-Zip inerface plugin installed first." instead.
-#: Merge.rc:1466
+#: Merge.rc:1449
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
msgstr "\xA5\xB2\xB6\xB7\xA5\xFD\xA6w\xB8\xCB 7-Zip \xA4\xB6\xAD\xB1\xA5~\xB1\xBE\xA1A\xA9\xB3\xA4U\xBFﶵ\xA4~\xA5i\xA6\xE6\xA1G"
# I suggest "Download 7-Zip Interface-Plugin" instead.
-#: Merge.rc:1468
+#: Merge.rc:1451
#, c-format
msgid "Download 7-zip Plugin"
msgstr "\xA4U\xB8\xFC 7-Zip \xA4\xB6\xAD\xB1\xA5~\xB1\xBE"
-#: Merge.rc:1469
+#: Merge.rc:1452
#, c-format
msgid "&Enable archive file support"
msgstr "\xC0\xA3\xC1Y\xC0ɤ䴩(&E)"
# I suggest "Use installed 7-Zip software" instead.
-#: Merge.rc:1471
+#: Merge.rc:1454
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr "\xA8ϥοW\xA5ߪ\xBA 7-Zip \xB3n\xC5\xE9(&U)"
# \xA8ϥΥH sp in + st op \xBFﶵ\xA6w\xB8˪\xBA\xA5[\xB1\xBE\xC0\xC9(\xA6w\xB8\xCB7-Zip \xA5~\xB1\xBE\xAE\xC9)(&S)
# I suggest "U&se WinMerge-dependent 7-Zip" or "U&se 7-Zip components installed by WinMerge Plugin-installer" instead.
-#: Merge.rc:1474
+#: Merge.rc:1457
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr "\xA8ϥΤ\xA3\xBFW\xA5ߩ\xF3 WinMerge \xAA\xBA 7-Zip \xAE֤ߤ\xB8\xA5\xF3(&S)"
-#: Merge.rc:1476
+#: Merge.rc:1459
#, c-format
msgid "&Detect archive type from file signature"
msgstr "\xB0\xBB\xB4\xFA\xC0ɭ\xBA\xB8\xEA\xB0T\xA5H\xA8M\xA9w\xC0\xA3\xC1Y\xC0\xC9\xC3\xFE\xAB\xAC(&D)"
-#: Merge.rc:1484
+#: Merge.rc:1467
#, c-format
msgid "Compare Statistics"
msgstr "\xA4\xF1\xB8\xFB\xAB᪺\xB2έp"
-#: Merge.rc:1487
+#: Merge.rc:1470
#, c-format
msgid "Folders:"
msgstr "\xB8\xEA\xAEƧ\xA8\xA1G"
-#: Merge.rc:1488
+#: Merge.rc:1471
#, c-format
msgid "Files:"
msgstr "\xC0ɮסG"
-#: Merge.rc:1489
-#: Merge.rc:2355
+#: Merge.rc:1472
+#: Merge.rc:2359
#, c-format
msgid "Different"
msgstr "\xA4\xA3\xA6P"
-#: Merge.rc:1490
+#: Merge.rc:1473
#, c-format
msgid "Text:"
msgstr "\xA4\xE5\xA6r\xA1G"
-#: Merge.rc:1493
-#: Merge.rc:1512
+#: Merge.rc:1476
+#: Merge.rc:1495
#, c-format
msgid "Binary:"
msgstr "\xA4G\xB6i\xA8\xEE\xA1G"
-#: Merge.rc:1496
+#: Merge.rc:1479
#, c-format
msgid "Unique"
msgstr "\xBFW\xA6\xB3"
-#: Merge.rc:1497
+#: Merge.rc:1480
#, c-format
msgid "Left:"
msgstr "\xA5\xAA\xC3\xE4\xA1G"
-#: Merge.rc:1502
+#: Merge.rc:1485
#, c-format
msgid "Right:"
msgstr "\xA5k\xC3\xE4\xA1G"
-#: Merge.rc:1507
-#: Merge.rc:2349
+#: Merge.rc:1490
+#: Merge.rc:2353
#, c-format
msgid "Identical"
msgstr "\xA5\xFE\xA6P"
-#: Merge.rc:1516
+#: Merge.rc:1499
#, c-format
msgid "Total:"
msgstr "\xC1`\xADp\xA1G"
-#: Merge.rc:1521
+#: Merge.rc:1504
#, c-format
msgid "Close"
msgstr "\xC3\xF6\xB3\xAC"
-#: Merge.rc:1530
+#: Merge.rc:1513
#, c-format
msgid "Affects"
msgstr "\xBCv\xC5T"
-#: Merge.rc:1533
-#: Merge.rc:1536
+#: Merge.rc:1516
+#: Merge.rc:1519
#, c-format
msgid "(Affects)"
msgstr "(\xBCv\xC5T)"
-#: Merge.rc:1537
+#: Merge.rc:1520
#, c-format
msgid "Select Codepage for"
msgstr "\xBF\xEF\xA9w\xBDs\xBDX\xAD\xB6\xB5\xB9"
-#: Merge.rc:1538
+#: Merge.rc:1521
#, c-format
msgid "&File Loading:"
msgstr "\xADn\xB8\xFC\xA4J\xAA\xBA\xC0ɮ\xD7(&F)\xA1G"
-#: Merge.rc:1540
-#: Merge.rc:1543
+#: Merge.rc:1523
+#: Merge.rc:1526
#, c-format
msgid "..."
msgstr "..."
-#: Merge.rc:1541
+#: Merge.rc:1524
#, c-format
msgid "File &Saving:"
msgstr "\xADn\xC0x\xA6s\xAA\xBA\xC0ɮ\xD7(&S)\xA1G"
-#: Merge.rc:1544
+#: Merge.rc:1527
#, c-format
msgid "&Use same codepage for both"
msgstr "\xA8\xE2\xC0ɳ\xA3\xA5άۦP\xAA\xBA\xBDs\xBDX\xAD\xB6(&U)"
-#: Merge.rc:1547
+#: Merge.rc:1530
#, c-format
msgid "&Apply"
msgstr "\xAEM\xA5\xCE(&A)"
-#: Merge.rc:1548
-#: Merge.rc:1930
+#: Merge.rc:1531
+#: Merge.rc:1931
#, c-format
msgid "&Cancel"
msgstr "\xA8\xFA\xAE\xF8(&C)"
-#: Merge.rc:1553
+#: Merge.rc:1536
#, c-format
msgid "Test Filter"
msgstr "\xB4\xFA\xB8տz\xBFﾹ"
-#: Merge.rc:1556
+#: Merge.rc:1539
#, c-format
msgid "Testing filter ..."
msgstr "\xB4\xFA\xB8տz\xBFﾹ ..."
-#: Merge.rc:1558
+#: Merge.rc:1541
#, c-format
msgid "&Enter text to test:"
msgstr "\xBF\xE9\xA4J\xA4\xE5\xA6r\xA5H\xB0\xB5\xB4\xFA\xB8\xD5(&E)\xA1G"
-#: Merge.rc:1560
+#: Merge.rc:1543
#, c-format
msgid "&Folder Name"
msgstr "\xB8\xEA\xAEƧ\xA8\xA6W\xBA\xD9(&F)"
-#: Merge.rc:1562
+#: Merge.rc:1545
#, c-format
msgid "Result:"
msgstr "\xB5\xB2\xAAG\xA1G"
-#: Merge.rc:1566
+#: Merge.rc:1549
#, c-format
msgid "&Test"
msgstr "\xB4\xFA\xB8\xD5(&T)"
-#: Merge.rc:1567
+#: Merge.rc:1550
#, c-format
msgid "&Close"
msgstr "\xC3\xF6\xB3\xAC(&C)"
-#: Merge.rc:1575
+#: Merge.rc:1558
#, c-format
msgid "&Use customized text colors"
msgstr "\xA8ϥΦۭq\xA4\xE5\xA6r\xA6\xE2\xB1m(&U)"
-#: Merge.rc:1578
+#: Merge.rc:1561
#, c-format
msgid "Custom text colors"
msgstr "\xA6ۭq\xA4\xE5\xA6r\xA6\xE2\xB1m"
-#: Merge.rc:1580
+#: Merge.rc:1563
#, c-format
msgid "Whitespace:"
msgstr "\xAAťաG"
-#: Merge.rc:1581
+#: Merge.rc:1564
#, c-format
msgid "Regular text:"
msgstr "\xC3\xFE\xAB\xAC\xAA\x{D9A1}\xA4\xE5\xA1G"
-#: Merge.rc:1582
+#: Merge.rc:1565
#, c-format
msgid "Selection:"
msgstr "\xBF\xEF\xA8\xFA\xA1G"
-#: Merge.rc:1605
+#: Merge.rc:1588
#, c-format
msgid "Paths"
msgstr "\xB8\xF4\xAE|"
-#: Merge.rc:1611
+#: Merge.rc:1594
#, c-format
msgid "R&ead-only"
msgstr "\xB0\xDFŪ(&E)"
-#: Merge.rc:1615
+#: Merge.rc:1598
#, c-format
msgid "Re&ad-only"
msgstr "\xB0\xDFŪ(&A)"
-#: Merge.rc:1621
+#: Merge.rc:1604
#, c-format
msgid "Open..."
msgstr "\xB6}\xB1\xD2..."
-#: Merge.rc:1622
+#: Merge.rc:1605
#, c-format
msgid "Save..."
msgstr "\xC0x\xA6s..."
-#: Merge.rc:1627
-#: Merge.rc:1965
+#: Merge.rc:1610
+#: Merge.rc:1966
#, c-format
msgid "Backup Files"
msgstr "\xB3ƥ\xF7\xC0ɮ\xD7"
-#: Merge.rc:1630
+#: Merge.rc:1613
#, c-format
msgid "Create backup files in:"
msgstr "\xB2\xA3\xA5ͳƥ\xF7\xC0ɩ\xF3\xA1G"
-#: Merge.rc:1635
+#: Merge.rc:1618
#, c-format
msgid "Create backup files into:"
msgstr "\xB2\xA3\xA5ͳƥ\xF7\xC0ɦܡG"
-#: Merge.rc:1636
+#: Merge.rc:1619
#, c-format
msgid "&Original file's folder"
msgstr "\xAD\xEC\xA9l\xC0ɪ\xBA\xB8\xEA\xAEƧ\xA8(&O)"
-#: Merge.rc:1638
+#: Merge.rc:1621
#, c-format
msgid "&Global backup folder:"
msgstr "\xC1`\xAA\xBA\xB3ƥ\xF7\xB8\xEA\xAEƧ\xA8(&G)\xA1G"
-#: Merge.rc:1642
+#: Merge.rc:1625
#, c-format
msgid "Backup filename:"
msgstr "\xB3ƥ\xF7\xC0\xC9\xC0ɦW\xA1G"
-#: Merge.rc:1643
+#: Merge.rc:1626
#, c-format
msgid "&Append .bak -extension"
msgstr "\xAA\xFE\xA4W .bak \xB0\xC6\xC0ɦW(&A)"
-#: Merge.rc:1645
+#: Merge.rc:1628
#, c-format
msgid "A&ppend timestamp"
msgstr "\xAA\xFE\xA4W\xAEɶ\xA1\xC2W\xB0O(&P)"
-#: Merge.rc:1652
-#: Merge.rc:2257
+#: Merge.rc:1635
+#: Merge.rc:2261
#, c-format
msgid "Confirm Copy"
msgstr "\xBDT\xBB{\xBDƻs"
-#: Merge.rc:1656
+#: Merge.rc:1639
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr "\xBDT\xA9w\xADn\xBDƻs XXX \xB6\xB5\xA5ءH"
-#: Merge.rc:1658
+#: Merge.rc:1641
#, c-format
msgid "From left"
msgstr "\xB1q\xA5\xAA\xC3\xE4"
-#: Merge.rc:1661
+#: Merge.rc:1644
#, c-format
msgid "To right"
msgstr "\xA8\xEC\xA5k\xC3\xE4"
-#: Merge.rc:1664
+#: Merge.rc:1647
#, c-format
msgid "Yes"
msgstr "\xACO"
-#: Merge.rc:1665
+#: Merge.rc:1648
#, c-format
msgid "No"
msgstr "\xA7_"
-#: Merge.rc:1671
+#: Merge.rc:1654
#, c-format
msgid "Plugins"
msgstr "\xA5~\xB1\xBE"
-#: Merge.rc:1674
+#: Merge.rc:1657
#, c-format
msgid "&Enable plugins"
msgstr "\xB1ҥΥ~\xB1\xBE(&E)"
-#: Merge.rc:1685
-#: Merge.rc:1966
+#: Merge.rc:1668
+#: Merge.rc:1967
#, c-format
msgid "Shell Integration"
msgstr "\xA8֤J\xC0ɮ\xD7\xC1`\xBAޤ\xB6\xAD\xB1"
-#: Merge.rc:1688
+#: Merge.rc:1671
#, c-format
msgid "Explorer"
msgstr "\xC0ɮ\xD7\xC1`\xBA\xDE"
-#: Merge.rc:1689
+#: Merge.rc:1672
#, c-format
msgid "E&nable advanced menu"
msgstr "\xB1ҥζi\xB6\xA5\xBF\xEF\xB3\xE6(&N)"
-#: Merge.rc:1691
+#: Merge.rc:1674
#, c-format
msgid "In&clude subfolders by default"
msgstr "\xA6۰ʥ]\xACA\xA4l\xA5ؿ\xFD(&C)"
-#: Merge.rc:1693
+#: Merge.rc:1676
#, c-format
msgid "&Add to context menu"
msgstr "\xA5[\xA8\xEC\xA5k\xC1\xE4\xBF\xEF\xB3\xE6(&A)"
-#: Merge.rc:1695
+#: Merge.rc:1678
#, c-format
msgid "Folder compare"
msgstr "\xB8\xEA\xAEƧ\xA8\xA4\xF1\xB8\xFB"
-#: Merge.rc:1696
+#: Merge.rc:1679
#, c-format
msgid "Add &Shell menu to context menu"
msgstr "\xB1N WinMerge \xBF\xEF\xB3\xE6\xA5[\xA8\xEC\xA5k\xC1\xE4\xBF\xEF\xB3\xE6(&S)"
+#: Merge.rc:1686
+#: Merge.rc:1970
+#: Merge.rc:2307
+#, c-format
+msgid "Folder"
+msgstr "\xB8\xEA\xAEƧ\xA8"
+
+#: Merge.rc:1689
+#, c-format
+msgid "&Compare method:"
+msgstr "\xC0ɮפ\xF1\xB8\xFB\xA4覡(&C)\xA1G"
+
+#: Merge.rc:1691
+#, c-format
+msgid "S&top after first difference"
+msgstr "\xB2Ĥ@\xADӮt\xB2\xA7\xB4N\xB0\xB1(&T)"
+
+#: Merge.rc:1693
+#, c-format
+msgid "Ign&ore time differences less than 3 seconds"
+msgstr "\xA6p\xA8\xE2\xC0ɮפ\xA7\xADק\xEF\xAEɶ\xA1\xB6\xA1\xB9j\xA4֩\xF3\xA4T\xAC\xED\xA1A\xABh\xA9\xBF\xB2\xA4\xA6\xB9\xAEt\xB2\xA7(&O)"
+
+#: Merge.rc:1695
+#, c-format
+msgid "&Include unique subfolders contents"
+msgstr "\xA5]\xACA\xBFW\xA4@\xA4l\xB8\xEA\xAEƧ\xA8(&I)"
+
+#: Merge.rc:1697
+#, c-format
+msgid "&Quick compare limit (MB):"
+msgstr "\xA7ֳt\xA4\xF1\xB8\xFB\xA4\xA7\xC0ɮפj\xA4p\xA4W\xAD\xAD (MB)(&Q)\xA1G"
+
#. StringFileInfo.Block
-#: Merge.rc:1722
+#: Merge.rc:1723
#, c-format
msgid "040904e4"
msgstr "040403B6"
#. VarFileInfo.Translation
-#: Merge.rc:1738
+#: Merge.rc:1739
#, c-format
msgid "0x409, 1252"
msgstr "0x404, 950"
-#: Merge.rc:1753
+#: Merge.rc:1754
#, c-format
msgid "Ready"
msgstr "\xB4N\xBA\xFC"
-#: Merge.rc:1759
+#: Merge.rc:1760
#, c-format
msgid "EXT"
msgstr "EXT"
-#: Merge.rc:1760
+#: Merge.rc:1761
#, c-format
msgid "CAP"
msgstr "CAP"
-#: Merge.rc:1761
+#: Merge.rc:1762
#, c-format
msgid "NUM"
msgstr "NUM"
-#: Merge.rc:1762
+#: Merge.rc:1763
#, c-format
msgid "SCRL"
msgstr "SCRL"
-#: Merge.rc:1763
+#: Merge.rc:1764
#, c-format
msgid "OVR"
msgstr "OVR"
-#: Merge.rc:1764
+#: Merge.rc:1765
#, c-format
msgid "REC"
msgstr "REC"
-#: Merge.rc:1770
+#: Merge.rc:1771
#, c-format
msgid ""
"Create empty documents\n"
@@ -2725,7 +2746,7 @@
"\xABإߪťդ\xE5\xA5\xF3\n"
"\xB7s\xA4\xE5\xA5\xF3 (Ctrl+N)"
-#: Merge.rc:1771
+#: Merge.rc:1772
#, c-format
msgid ""
"Open an existing document\n"
@@ -2734,7 +2755,7 @@
"\xB6}\xB1Ҳ{\xA6s\xA4\xE5\xA5\xF3\n"
"\xB6}\xB1\xD2 (Ctrl+O)"
-#: Merge.rc:1772
+#: Merge.rc:1773
#, c-format
msgid ""
"Close the active document\n"
@@ -2743,7 +2764,7 @@
"\xC3\x{1B3B25}ثe\xBDs\xBF\xE8\xA4\xE5\xA5\xF3\n"
"\xC3\xF6\xB3\xAC"
-#: Merge.rc:1773
+#: Merge.rc:1774
#, c-format
msgid ""
"Save the active document\n"
@@ -2752,7 +2773,7 @@
"\xC0x\xA6s\xA5ثe\xBDs\xBF\xE8\xA4\xE5\xA5\xF3\n"
"\xC0x\xA6s (Ctrl+S)"
-#: Merge.rc:1774
+#: Merge.rc:1775
#, c-format
msgid ""
"Save the active document with a new name\n"
@@ -2761,7 +2782,7 @@
"\xA5H\xB7s\xA6W\xBA\xD9\xC0x\xA6s\xA5ثe\xBDs\xBF\xE8\xA4\xE5\xA5\xF3\n"
"\xA5t\xA6s\xB7s\xC0\xC9"
-#: Merge.rc:1775
+#: Merge.rc:1776
#, c-format
msgid ""
"Change the printing options\n"
@@ -2770,7 +2791,7 @@
"\xC5ܧ\xF3\xA6C\xA6L\xBFﶵ\n"
"\xAA\xA9\xAD\xB1\xB3]\xA9w"
-#: Merge.rc:1776
+#: Merge.rc:1777
#, c-format
msgid ""
"Change the printer and printing options\n"
@@ -2779,7 +2800,7 @@
"\xC5ܧ\xF3\xA6L\xAA\xED\xBE\xF7\xA9M\xA6C\xA6L\xBFﶵ\n"
"\xA6C\xA6L\xB3]\xA9w"
-#: Merge.rc:1777
+#: Merge.rc:1778
#, c-format
msgid ""
"Print the active document\n"
@@ -2788,7 +2809,7 @@
"\xA6C\xA6L\xA5ثe\xBDs\xBF\xE8\xA4\xE5\xA5\xF3\n"
"\xA6C\xA6L"
-#: Merge.rc:1778
+#: Merge.rc:1779
#, c-format
msgid ""
"Display full pages\n"
@@ -2797,27 +2818,27 @@
"\xC5\xE3\xA5ܾ㭶\n"
"\xB9w\xC4\xFD\xA6C\xA6L"
-#: Merge.rc:1783
+#: Merge.rc:1784
#, c-format
msgid "Make all hidden items visible again"
msgstr "\xA8ϩҦ\xB3\xC1\xF4\xC2ö\xB5\xA5ئA\xC5\xE3\xA5ܥX\xA8\xD3"
-#: Merge.rc:1784
+#: Merge.rc:1785
#, c-format
msgid "Toggle tree mode"
msgstr "\xA4\xC1\xB4\xAB\xBE𪬼Ҧ\xA1"
-#: Merge.rc:1785
+#: Merge.rc:1786
#, c-format
msgid "Expand all subfolders"
msgstr "\xAEi\xB6}\xA9Ҧ\xB3\xA4l\xB8\xEA\xAEƧ\xA8"
-#: Merge.rc:1786
+#: Merge.rc:1787
#, c-format
msgid "Collapse all subfolders"
msgstr "\xA6\xAC\xA6X\xA9Ҧ\xB3\xA4l\xB8\xEA\xAEƧ\xA8"
-#: Merge.rc:1792
+#: Merge.rc:1793
#, c-format
msgid ""
"Open project file\n"
@@ -2826,32 +2847,32 @@
"\xB6}\xB1ұM\xAE\xD7\xC0\xC9\n"
"\xB1M\xAE\xD7\xC0\xC9 (Ctrl+J)"
-#: Merge.rc:1793
+#: Merge.rc:1794
#, c-format
msgid "Unknown error attempting to open project file"
msgstr "\xB6}\xB1ұM\xAE\xD7\xC0ɮɵo\xA5ͤ\xA3\xA9\xFA\xBF\xF9\xBB~"
-#: Merge.rc:1794
+#: Merge.rc:1795
#, c-format
msgid "Unknown error attempting to save project file"
msgstr "\xC0x\xA6s\xB1M\xAE\xD7\xC0ɮɵo\xA5ͤ\xA3\xA9\xFA\xBF\xF9\xBB~"
-#: Merge.rc:1795
+#: Merge.rc:1796
#, c-format
msgid "Project File"
msgstr "\xB1M\xAE\xD7\xC0\xC9"
-#: Merge.rc:1796
+#: Merge.rc:1797
#, c-format
msgid "Project file successfully loaded."
msgstr "\xB1M\xAE\xD7\xC0ɦ\xA8\xA5\\xB8\xFC\xA4J\xA1C"
-#: Merge.rc:1797
+#: Merge.rc:1798
#, c-format
msgid "Project file successfully saved."
msgstr "\xB1M\xAE\xD7\xC0ɦ\xA8\xA5\\xC0x\xA6s\xA1C"
-#: Merge.rc:1798
+#: Merge.rc:1799
#, c-format
msgid ""
"Save current paths and options to project file\n"
@@ -2860,7 +2881,7 @@
"\xC0x\xA6s\xA5ثe\xB8\xF4\xAE|\xA4οﶵ\xA6ܱM\xAE\xD7\xC0\xC9\n"
"\xC0x\xA6s\xB1M\xAE\xD7\xC0\xC9"
-#: Merge.rc:1803
+#: Merge.rc:1804
#, c-format
msgid ""
"Display program information, version number and copyright\n"
@@ -2869,7 +2890,7 @@
"\xC5\xE3\xA5ܵ{\xA6\xA1\xB8\xEA\xB0T\xA1A\xAA\xA9\xA5\xBB\xB8\xB9\xBDX\xA9M\xB5ۧ@\xC5v\n"
"\xC3\xF6\xA9\xF3"
-#: Merge.rc:1804
+#: Merge.rc:1805
#, c-format
msgid ""
"Quit the application; prompts to save documents\n"
@@ -2878,7 +2899,6 @@
"\xC2\xF7\xB6}\xC0\xB3\xA5ε{\xA6\xA1\xA1F\xB4\xA3\xBF\xF4\xC0x\xA6s\xA4\xE5\xA5\xF3\n"
"\xB5\xB2\xA7\xF4"
-#: Merge.rc:1810
#: Merge.rc:1811
#: Merge.rc:1812
#: Merge.rc:1813
@@ -2894,11 +2914,12 @@
#: Merge.rc:1823
#: Merge.rc:1824
#: Merge.rc:1825
+#: Merge.rc:1826
#, c-format
msgid "Open this document"
msgstr "\xB6}\xB1Ҧ\xB9\xA4\xE5\xA5\xF3"
-#: Merge.rc:1830
+#: Merge.rc:1831
#, c-format
msgid ""
"Switch to the next window pane\n"
@@ -2907,7 +2928,7 @@
"\xA4\xC1\xB4\xAB\xA8\xEC\xA4U\xA4@\xB5\xF8\xB5\xA1\n"
"\xA4U\xA4@\xB5\xF8\xB5\xA1"
-#: Merge.rc:1831
+#: Merge.rc:1832
#, c-format
msgid ""
"Switch back to the previous window pane\n"
@@ -2916,7 +2937,7 @@
"\xA4\xC1\xB4\xAB\xA6^\xA4W\xA4@\xB5\xF8\xB5\xA1\n"
"\xA4W\xA4@\xB5\xF8\xB5\xA1"
-#: Merge.rc:1837
+#: Merge.rc:1838
#, c-format
msgid ""
"Arrange windows so they overlap\n"
@@ -2925,7 +2946,7 @@
"\xC5|\xB8m\xB5\xF8\xB5\xA1\n"
"\xC5|\xB8m\xB5\xF8\xB5\xA1"
-#: Merge.rc:1838
+#: Merge.rc:1839
#, c-format
msgid ""
"Arrange windows as non-overlapping tiles horizontally\n"
@@ -2934,7 +2955,7 @@
"\xABD\xC5|\xB8m\xA4W\xA4U\xB1ƦC\xB5\xF8\xB5\xA1\n"
"\xA4W\xA4U\xA8æC\xB5\xF8\xB5\xA1"
-#: Merge.rc:1839
+#: Merge.rc:1840
#, c-format
msgid ""
"Arrange windows as non-overlapping tiles vertically\n"
@@ -2943,7 +2964,7 @@
"\xABD\xC5|\xB8m\xA5\xAA\xA5k\xB1ƦC\xB5\xF8\xB5\xA1\n"
"\xA5\xAA\xA5k\xA8æC\xB5\xF8\xB5\xA1"
-#: Merge.rc:1845
+#: Merge.rc:1846
#, c-format
msgid ""
"Copy the selection and put it on the Clipboard\n"
@@ -2952,7 +2973,7 @@
"\xBDƻs\xA9ҿ\xEF\xA8\xEC\xB0ŶKï\n"
"\xBDƻs"
-#: Merge.rc:1846
+#: Merge.rc:1847
#, c-format
msgid ""
"Cut the selection and put it on the Clipboard\n"
@@ -2961,7 +2982,7 @@
"\xB0ŤU\xA9ҿ\xEF\xA8\xEC\xB0ŶKï\n"
"\xB0ŤU"
-#: Merge.rc:1847
+#: Merge.rc:1848
#, c-format
msgid ""
"Find the specified text\n"
@@ -2970,7 +2991,7 @@
"\xB4M\xA7\xE4\xAB\xFC\xA9w\xA4\xE5\xA6r\n"
"\xB4M\xA7\xE4"
-#: Merge.rc:1848
+#: Merge.rc:1849
#, c-format
msgid ""
"Insert Clipboard contents\n"
@@ -2979,7 +3000,7 @@
"\xB4\xA1\xA4J\xB0ŶKï\xA4\xBA\xAEe\n"
"\xB6K\xA4W"
-#: Merge.rc:1849
+#: Merge.rc:1850
#, c-format
msgid ""
"Repeat the last action\n"
@@ -2988,7 +3009,7 @@
"\xAD\xAB\xBDƤW\xA6\xB8\xAA\xBA\xB0ʧ@\n"
"\xAD\xAB\xBD\xC6"
-#: Merge.rc:1850
+#: Merge.rc:1851
#, c-format
msgid ""
"Replace specific text with different text\n"
@@ -2997,7 +3018,7 @@
"\xA5H\xA4\xA3\xA6P\xA4\xE5\xA6r\xA8\xFA\xA5N\xAB\xFC\xA9w\xA4\xE5\xA6r\n"
"\xA8\xFA\xA5N"
-#: Merge.rc:1851
+#: Merge.rc:1852
#, c-format
msgid ""
"Select the entire document\n"
@@ -3006,7 +3027,7 @@
"\xBF\xEF\xA8\xFA\xBE\xE3\xA5\xF7\xA4\xE5\xA5\xF3\n"
"\xA5\xFE\xBF\xEF"
-#: Merge.rc:1852
+#: Merge.rc:1853
#, c-format
msgid ""
"Undo the last action\n"
@@ -3015,7 +3036,7 @@
"\xBAM\xA6^\xA4W\xA6\xB8\xB0ʧ@\n"
"\xB4_\xAD\xEC"
-#: Merge.rc:1853
+#: Merge.rc:1854
#, c-format
msgid ""
"Redo the previously undone action\n"
@@ -3024,7 +3045,7 @@
"\xA6A\xB0\xB5\xA4W\xA6\xB8\xAA\xBA\xBAM\xA6^\n"
"\xA6A\xB0\xB5"
-#: Merge.rc:1859
+#: Merge.rc:1860
#, c-format
msgid ""
"Show or hide the toolbar\n"
@@ -3033,7 +3054,7 @@
"\xC5\xE3\xA5ܩ\xCE\xC1\xF4\xC2äu\xA8\xE3\xA6C\n"
"\xB1ҳ\xAC\xA4u\xA8\xE3\xA6C"
-#: Merge.rc:1860
+#: Merge.rc:1861
#, c-format
msgid ""
"Show or hide the status bar\n"
@@ -3042,7 +3063,7 @@
"\xC5\xE3\xA5ܩ\xCE\xC1\xF4\xC2ê\xAC\xBAA\xA6C\n"
"\xB1ҳ\xAC\xAA\xAC\xBAA\xA6C"
-#: Merge.rc:1861
+#: Merge.rc:1862
#, c-format
msgid ""
"Show or hide the tab bar\n"
@@ -3051,7 +3072,7 @@
"\xC5\xE3\xA5ܩ\xCE\xC1\xF4\xC2í\xB6\xC5ҦC\n"
"\xB1ҳ\xAC\xAD\xB6\xC5ҦC"
-#: Merge.rc:1862
+#: Merge.rc:1863
#, c-format
msgid ""
"Automatically resize panes\n"
@@ -3060,57 +3081,57 @@
"\xA6۰ʽվ㵡\xAE\xE6\xA4j\xA4p\n"
"\xC2\xEA\xA6\x{DD61}\xAE\xE6"
-#: Merge.rc:1868
+#: Merge.rc:1869
#, c-format
msgid "Change the window size"
msgstr "\xA7\xF3\xA7\xEF\xB5\xF8\xB5\xA1\xA4j\xA4p"
-#: Merge.rc:1869
+#: Merge.rc:1870
#, c-format
msgid "Change the window position"
msgstr "\xA7\xF3\xA7\xEF\xB5\xF8\xB5\xA1\xA6\xEC\xB8m"
-#: Merge.rc:1870
+#: Merge.rc:1871
#, c-format
msgid "Reduce the window to an icon"
msgstr "\xC1Y\xA4p\xB5\x{D619A8}\xB9ϥ\xDC"
-#: Merge.rc:1871
+#: Merge.rc:1872
#, c-format
msgid "Enlarge the window to full size"
msgstr "\xC2X\xA4j\xB5\x{D619A8}\xA5\xFE\xBFù\xF5"
-#: Merge.rc:1872
+#: Merge.rc:1873
#, c-format
msgid "Switch to the next document window"
msgstr "\xA4\xC1\xB4\xAB\xA8\xEC\xA4U\xA4@\xA4\xE5\xA5\xF3\xB5\xF8\xB5\xA1"
-#: Merge.rc:1873
+#: Merge.rc:1874
#, c-format
msgid "Switch to the previous document window"
msgstr "\xA4\xC1\xB4\xAB\xA8\xEC\xA4W\xA4@\xA4\xE5\xA5\xF3\xB5\xF8\xB5\xA1"
-#: Merge.rc:1874
+#: Merge.rc:1875
#, c-format
msgid "Close the active window and prompts to save the documents"
msgstr "\xC3\x{1B3B25}ثe\xBDs\xBF\xE8\xB5\xF8\xB5\xA1\xA8ô\xA3\xBF\xF4\xC0x\xA6s\xA4\xE5\xA5\xF3"
-#: Merge.rc:1879
+#: Merge.rc:1880
#, c-format
msgid "Restore the window to normal size"
msgstr "\xB5\xF8\xB5\xA1\xAB\xEC\xB4_\xBCзǤj\xA4p"
-#: Merge.rc:1880
+#: Merge.rc:1881
#, c-format
msgid "Activate Task List"
msgstr "\xB1ҥΤu\xA7@\xB2M\xB3\xE6"
-#: Merge.rc:1881
+#: Merge.rc:1882
#, c-format
msgid "Activate this window"
msgstr "\xB1ҥγo\xADӵ\xF8\xB5\xA1"
-#: Merge.rc:1887
+#: Merge.rc:1888
#, c-format
msgid ""
"Close print preview mode\n"
@@ -3119,7 +3140,7 @@
"\xC3\x{1B3B39}w\xC4\xFD\xA6C\xA6L\xBCҦ\xA1\n"
"\xA8\xFA\xAE\xF8\xB9w\xC4\xFD"
-#: Merge.rc:1894
+#: Merge.rc:1895
#, c-format
msgid ""
"\n"
@@ -3138,7 +3159,7 @@
"WinMerge.\xC0ɮפ\xF1\xB8\xFB\n"
"WinMerge \xC0ɮפ\xF1\xB8\xFB"
-#: Merge.rc:1895
+#: Merge.rc:1896
#, c-format
msgid ""
"\n"
@@ -3157,23 +3178,23 @@
"WinMerge.\xB8\xEA\xAEƧ\xA8\xA4\xF1\xB8\xFB\n"
"WinMerge \xB8\xEA\xAEƧ\xA8\xA4\xF1\xB8\xFB"
-#: Merge.rc:1902
+#: Merge.rc:1903
#, c-format
msgid "Preserve original EOL chars"
msgstr "\xABO\xAFd\xAD\xEC\xA9l EOL \xA6r\xA4\xB8"
-#: Merge.rc:1909
+#: Merge.rc:1910
#, c-format
msgid "Press any key"
msgstr "\xAB\xF6\xA5\xF4\xB7N\xC1\xE4"
-#: Merge.rc:1915
#: Merge.rc:1916
+#: Merge.rc:1917
#, c-format
msgid "Right click on the path to copy"
msgstr "\xB9\xAB\xA5k\xC1\xE4\xC2I\xC0\xBB\xABݽƻs\xAA\xBA\xB8\xF4\xAE|"
-#: Merge.rc:1922
+#: Merge.rc:1923
#, c-format
msgid ""
"Developers:\n"
@@ -3182,157 +3203,158 @@
"\xAC\xE3\xB5o\xAA̡G\n"
"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
-#: Merge.rc:1923
+#: Merge.rc:1924
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
msgstr "\xB5\xB4\xA4\xA3\xABO\xC3Ҧۥѳn\xC5\xE9 WinMerge \xB5L\xB7岫\xA1C\xC5w\xAA\xEF\xA6b\xACY\xA8DZ\xF8\xA5\xF3\xA4U\xA6A\xB4\xB2\xB5o\xA5\xA6\xA1F\xB2Ӹ`\xA8\xA3\xBB\xA1\xA9\xFA\xBF\xEF\xB3椤\xAA\xBA GNU \xA4\xBD\xA6@\xB1\xC2\xC5v\xC3ҡC"
-#: Merge.rc:1929
+#: Merge.rc:1930
#, c-format
msgid "&Ok"
msgstr "\xBDT\xA9w(&O)"
-#: Merge.rc:1931
+#: Merge.rc:1932
#, c-format
msgid "&Abort"
msgstr "\xA9\xF1\xB1\xF3(&A)"
-#: Merge.rc:1932
+#: Merge.rc:1933
#, c-format
msgid "&Retry"
msgstr "\xAD\xAB\xB8\xD5(&R)"
-#: Merge.rc:1933
+#: Merge.rc:1934
#, c-format
msgid "&Ignore"
msgstr "\xA9\xBF\xB2\xA4(&I)"
-#: Merge.rc:1934
+#: Merge.rc:1935
#, c-format
msgid "Ignore &all"
msgstr "\xA5\xFE\xB3\xA1\xA9\xBF\xB2\xA4(&A)"
-#: Merge.rc:1935
+#: Merge.rc:1936
#, c-format
msgid "&Yes"
msgstr "\xACO(&Y)"
-#: Merge.rc:1941
+#: Merge.rc:1942
#, c-format
msgid "Yes to &all"
msgstr "\xA5\xFE\xB3\xA1\xACҬO(&A)"
-#: Merge.rc:1942
+#: Merge.rc:1943
#, c-format
msgid "&No"
msgstr "\xA7_(&N)"
-#: Merge.rc:1943
+#: Merge.rc:1944
#, c-format
msgid "No to a&ll"
msgstr "\xA5\xFE\xB3\xA1\xACҧ_(&L)"
-#: Merge.rc:1944
+#: Merge.rc:1945
#, c-format
msgid "&Continue"
msgstr "\xC4~\xC4\xF2(&C)"
-#: Merge.rc:1945
+#: Merge.rc:1946
#, c-format
msgid "&Skip"
msgstr "\xB2\xA4\xB9L(&S)"
-#: Merge.rc:1946
+#: Merge.rc:1947
#, c-format
msgid "Skip &all"
msgstr "\xA5\xFE\xB3\xA1\xB2\xA4\xB9L(&A)"
-#: Merge.rc:1948
+#: Merge.rc:1949
#, c-format
msgid "Don't display this &message again."
msgstr "\xA4\xA3\xADn\xA6A\xC5\xE3\xA5ܳo\xADӰT\xAE\xA7(&M)"
-#: Merge.rc:1949
+#: Merge.rc:1950
#, c-format
msgid "Don't ask this &question again."
msgstr "\xA4\xA3\xADn\xA6A\xB4\xA3\xA5ܳo\xADӰ\xDD\xC3D(&Q)"
-#: Merge.rc:1959
+#: Merge.rc:1961
#, c-format
-msgid "Syntax colors"
-msgstr "\xBBy\xAAk\xA6\xE2\xB1m"
+msgid "Syntax"
+msgstr "\xBBy\xAAk"
-#: Merge.rc:1960
+#: Merge.rc:1963
#, c-format
-msgid "Text Colors"
-msgstr "\xA4\xE5\xA6r\xA6\xE2\xB1m"
-
-#: Merge.rc:1962
-#, c-format
msgid "Version Control"
msgstr "\xAA\xA9\xA5\xBB\xB1\xB1\xA8\xEE"
-#: Merge.rc:1973
+#: Merge.rc:1968
+#: Merge.rc:2339
#, c-format
+msgid "Differences"
+msgstr "\xAEt\xB2\xA7"
+
+#: Merge.rc:1977
+#, c-format
msgid "To:"
msgstr "\xA8\xEC\xA1G"
-#: Merge.rc:1974
+#: Merge.rc:1978
#, c-format
msgid "From left:"
msgstr "\xB1q\xA5\xAA\xC3\xE4\xA1G"
-#: Merge.rc:1975
+#: Merge.rc:1979
#, c-format
msgid "To left:"
msgstr "\xA8쥪\xC3\xE4\xA1G"
-#: Merge.rc:1976
+#: Merge.rc:1980
#, c-format
msgid "From right:"
msgstr "\xB1q\xA5k\xC3\xE4\xA1G"
-#: Merge.rc:1977
+#: Merge.rc:1981
#, c-format
msgid "To right:"
msgstr "\xA8\xEC\xA5k\xC3\xE4\xA1G"
-#: Merge.rc:1983
+#: Merge.rc:1987
#, c-format
msgid "Version %1"
msgstr "\xAA\xA9\xA5\xBB %1"
-#: Merge.rc:1984
+#: Merge.rc:1988
#, c-format
msgid "Unicode"
msgstr "\xB8U\xB0\xEA\xBDX"
-#: Merge.rc:1985
+#: Merge.rc:1989
#, c-format
msgid "X64"
msgstr "X64"
-#: Merge.rc:1991
+#: Merge.rc:1995
#, c-format
msgid "Options (%1)"
msgstr "\xBFﶵ (%1)"
-#: Merge.rc:1992
+#: Merge.rc:1996
#, c-format
msgid "All message boxes are now displayed again."
msgstr "\xA9Ҧ\xB3\xB0T\xAE\xA7\xB2\xB0\xB2{\xA6b\xB7|\xA6A\xC5\xE3\xA5ܡC"
-#: Merge.rc:1993
+#: Merge.rc:1997
#, c-format
msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted."
msgstr "\xC0ɮפ\xF1\xB9諸\xB3]\xA9w\xA4w\xB3Q\xADק\xEF\xA1C\xAD\xAB\xB7s\xB1Ұʤ\xF1\xB9\xEF\xA1A\xA8\xBA\xA8dz]\xA9w\xA4~\xB7|\xA5ͮġC"
-#: Merge.rc:1994
+#: Merge.rc:1998
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
msgstr "\xA9ҿ\xEF\xA6r\xAB\xAC\xA4\xA7\xC5ܧ|\xAEM\xA5Ψ\xEC\xA5\xF4\xA6\xF3\xA5ثe\xC5\xE3\xB2{\xAEt\xB2\xA7\xAA\xBA\xB5\xF8\xB5\xA1\xA1C"
-#: Merge.rc:1996
+#: Merge.rc:2000
#, c-format
msgid ""
"Value in Tab size -field is not in range WinMerge accepts.\n"
@@ -3343,7 +3365,7 @@
"\n"
"\xBDХέ\xC8 1 - %1\xA1C"
-#: Merge.rc:1998
+#: Merge.rc:2002
#, c-format
msgid ""
"Are you sure you want to reset all WinMerge options to default values?\n"
@@ -3354,130 +3376,130 @@
"\n"
"\xAD\xAB\xB3]\xAB\xE1\xBDЭ\xAB\xB7s\xB1Ұ\xCA WinMerge\xA1C"
-#: Merge.rc:2004
+#: Merge.rc:2008
#, c-format
msgid "Open"
msgstr "\xB6}\xB1\xD2"
-#: Merge.rc:2005
+#: Merge.rc:2009
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "\xB5{\xA6\xA1|*.exe;*.bat;*.cmd|\xA9Ҧ\xB3\xC0ɮ\xD7 (*.*)|*.*||"
-#: Merge.rc:2006
+#: Merge.rc:2010
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr "\xA9Ҧ\xB3\xC0ɮ\xD7 (*.*)|*.*||"
-#: Merge.rc:2007
+#: Merge.rc:2011
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "WinMerge \xB1M\xAE\xD7\xC0\xC9 (*.WinMerge)|*.WinMerge||"
-#: Merge.rc:2009
+#: Merge.rc:2013
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "\xBFﶵ\xC0\xC9 (*.ini)|*.ini|\xA9Ҧ\xB3\xC0ɮ\xD7 (*.*)|*.*||"
-#: Merge.rc:2015
+#: Merge.rc:2019
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Text \xC0\xC9 (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
-#: Merge.rc:2016
+#: Merge.rc:2020
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "HTML \xC0\xC9 (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
-#: Merge.rc:2017
+#: Merge.rc:2021
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "XML \xC0\xC9 (*.xml)|*.xml|All Files (*.*)|*.*||"
-#: Merge.rc:2023
+#: Merge.rc:2027
#, c-format
msgid "UTF-8"
msgstr "UTF-8"
-#: Merge.rc:2024
+#: Merge.rc:2028
#, c-format
msgid "UTF-8 (B)"
msgstr "UTF-8 (B)"
-#: Merge.rc:2025
+#: Merge.rc:2029
#, c-format
msgid "UCS-2 LE"
msgstr "UCS-2 LE"
-#: Merge.rc:2026
+#: Merge.rc:2030
#, c-format
msgid "UCS-2 BE"
msgstr "UCS-2 BE"
-#: Merge.rc:2032
+#: Merge.rc:2036
#, c-format
msgid "Full Contents"
msgstr "\xA7\xB9\xBE㤺\xAEe"
-#: Merge.rc:2033
+#: Merge.rc:2037
#, c-format
msgid "Quick Contents"
msgstr "\xA7ֳt\xA4\xBA\xAEe"
-#: Merge.rc:2034
+#: Merge.rc:2038
#, c-format
msgid "Modified Date"
msgstr "\xADק\xEF\xA4\xE9\xB4\xC1"
-#: Merge.rc:2035
+#: Merge.rc:2039
#, c-format
msgid "Modified Date and Size"
msgstr "\xADק\xEF\xA4\xE9\xB4\xC1\xBBP\xA4j\xA4p"
-#: Merge.rc:2036
+#: Merge.rc:2040
#, c-format
msgid "Size"
msgstr "\xA4j\xA4p"
-#: Merge.rc:2042
-#: Merge.rc:2667
+#: Merge.rc:2046
+#: Merge.rc:2572
#, c-format
msgid "Name"
msgstr "\xA6W\xBA\xD9"
-#: Merge.rc:2043
+#: Merge.rc:2047
#, c-format
msgid "Location"
msgstr "\xA6\xEC\xB8m"
-#: Merge.rc:2044
+#: Merge.rc:2048
#, c-format
msgid "Filters"
msgstr "\xBFz\xBFﾹ"
-#: Merge.rc:2045
+#: Merge.rc:2049
#, c-format
msgid "[F] "
msgstr "[F] "
-#: Merge.rc:2046
-#: Merge.rc:2669
+#: Merge.rc:2050
+#: Merge.rc:2574
#, c-format
msgid "Description"
msgstr "\xB4y\xADz"
# I suggest "Add new filter filename" instead. For it must not select a name, rather give one.
-#: Merge.rc:2047
+#: Merge.rc:2051
#, c-format
msgid "Select filename for new filter"
msgstr "\xABإ߷s\xBFz\xBFﾹ\xC0ɦW"
-#: Merge.rc:2048
+#: Merge.rc:2052
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "\xC0ɮz\xBFﾹ (*.flt)|*.flt|\xA9Ҧ\xB3\xC0ɮ\xD7 (*.*)|*.*||"
-#: Merge.rc:2050
+#: Merge.rc:2054
#, c-format
msgid ""
"Cannot find file filter template file!\n"
@@ -3490,7 +3512,7 @@
"\xBDнƻs\xC0ɮ\xD7 %1 \xA8\xEC WinMerge/\xC0ɮz\xBFﾹ-\xB8\xEA\xAEƧ\xA8\xA1G\n"
"%2\xA1C"
-#: Merge.rc:2052
+#: Merge.rc:2056
#, c-format
msgid ""
"Cannot copy filter template file to filter folder:\n"
@@ -3503,7 +3525,7 @@
"\n"
"\xBDнT\xA9w\xA6\xB3\xB8Ӹ\xEA\xAEƧ\xA8\xA1A\xA6ӥB\xA4\xB9\xB3\\xBCg\xA4J\xA1C"
-#: Merge.rc:2054
+#: Merge.rc:2058
#, c-format
msgid ""
"User's filter file folder is not defined!\n"
@@ -3514,7 +3536,7 @@
"\n"
"\xBDЩ\xF3\xA1u\xBFﶵ/\xA8t\xB2Ρv\xA4\xA4\xBF\xEF\xA9w\xC0ɮz\xBFﾹ\xB8\xEA\xAEƧ\xA8\xA1C"
-#: Merge.rc:2056
+#: Merge.rc:2060
#, c-format
msgid ""
"Failed to delete the filter file:\n"
@@ -3527,12 +3549,12 @@
"\n"
"\xA5\xA6\xACO\xB0\xDFŪ\xC0ɡH"
-#: Merge.rc:2057
+#: Merge.rc:2061
#, c-format
msgid "Locate filter file to install"
msgstr "\xA7\xE4\xA8\xEC\xC0ɮz\xBFﾹ\xC0ɥH\xA6w\xB8\xCB"
-#: Merge.rc:2059
+#: Merge.rc:2063
#, c-format
msgid ""
"Installing filter file failed.\n"
@@ -3543,17 +3565,17 @@
"\n"
"\xA4\xA3\xAF\xE0\xBDƻs\xB7s\xBFz\xBFﾹ\xC0ɨ\xEC\xC0ɮz\xBFﾹ\xB8\xEA\xAEƧ\xA8\xA1C"
-#: Merge.rc:2061
+#: Merge.rc:2065
#, c-format
msgid "Filter file already exists. Overwrite existing filter?"
msgstr "\xC0ɮz\xBFﾹ\xC0ɤw\xA6s\xA6b\xA1C\xC2л\\xA4\xA7\xA1H"
-#: Merge.rc:2067
+#: Merge.rc:2071
#, c-format
msgid "Regular expression"
msgstr "\xC3\xFE\xAB\xAC\xAA\x{D9A1}"
-#: Merge.rc:2073
+#: Merge.rc:2077
#, c-format
msgid ""
"Filters were updated. Do you want to refresh all open folder compares?\n"
@@ -3564,203 +3586,203 @@
"\n"
"\xA6p\xA4\xA3\xB7Q\xB2{\xA6b\xAD\xAB\xBE\xE3\xA1A\xBF\xEF\xA1u\xA7_\xA1v\xA1A\xA5H\xAB\xE1\xA6A\xAD\xAB\xBE\xE3\xA1C"
-#: Merge.rc:2080
+#: Merge.rc:2084
#, c-format
msgid "&Path to SS.EXE:"
msgstr "\xA6\xDC SS.EXE \xAA\xBA\xB8\xF4\xAE|(&P)"
-#: Merge.rc:2086
+#: Merge.rc:2090
#, c-format
msgid "Folder Comparison Results"
msgstr "\xB8\xEA\xAEƧ\xA8\xA4\xF1\xB9ﵲ\xAAG"
-#: Merge.rc:2087
+#: Merge.rc:2091
#, c-format
msgid "File Comparison"
msgstr "\xC0ɮפ\xF1\xB9襤"
-#: Merge.rc:2088
+#: Merge.rc:2092
#, c-format
msgid "Untitled left"
msgstr "\xA5\xBC\xB3]\xBC\xD0\xC3D\xAA\xBA\xA5\xAA\xC3\xE4"
-#: Merge.rc:2089
+#: Merge.rc:2093
#, c-format
msgid "Untitled right"
msgstr "\xA5\xBC\xB3]\xBC\xD0\xC3D\xAA\xBA\xA5k\xC3\xE4"
-#: Merge.rc:2090
+#: Merge.rc:2094
#, c-format
msgid "Theirs File"
msgstr "\xA5L\xAD̪\xBA(\xC0ɮ\xD7)"
-#: Merge.rc:2091
+#: Merge.rc:2095
#, c-format
msgid "Mine File"
msgstr "\xA7ڪ\xBA(\xC0ɮ\xD7)"
-#: Merge.rc:2097
+#: Merge.rc:2101
#, c-format
msgid "Scanning files..."
msgstr "\xB1\xBD\xB4y\xC0ɮ\xD7..."
-#: Merge.rc:2098
+#: Merge.rc:2102
#, c-format
msgid "Opening selection"
msgstr "\xB6}\xB1ҿ\xEF\xA8\xFA"
-#: Merge.rc:2099
+#: Merge.rc:2103
#, c-format
msgid "Copying Left to Right"
msgstr "\xA5\xBF\xBDƻs\xA5\xAA\xC3\xE4\xA8\xEC\xA5k\xC3\xE4"
-#: Merge.rc:2100
+#: Merge.rc:2104
#, c-format
msgid "Copying Right to Left"
msgstr "\xA5\xBF\xBDƻs\xA5k\xC3\xE4\xA8쥪\xC3\xE4"
-#: Merge.rc:2101
+#: Merge.rc:2105
#, c-format
msgid "Copying All to Left"
msgstr "\xA5\xBF\xBDƻs\xA5\xFE\xB3\xA1\xA8쥪\xC3\xE4"
-#: Merge.rc:2102
+#: Merge.rc:2106
#, c-format
msgid "Copying All to Right"
msgstr "\xA5\xBF\xBDƻs\xA5\xFE\xB3\xA1\xA8\xEC\xA5k\xC3\xE4"
-#: Merge.rc:2103
+#: Merge.rc:2107
#, c-format
msgid "Copying files..."
msgstr "\xA5\xBF\xBDƻs\xC0ɮ\xD7..."
-#: Merge.rc:2104
+#: Merge.rc:2108
#, c-format
msgid "Deleting files..."
msgstr "\xA5\xBF\xA7R\xB0\xA3\xC0ɮ\xD7..."
-#: Merge.rc:2105
+#: Merge.rc:2109
#, c-format
msgid "Moving files..."
msgstr "\xA5\xBF\xB2\xBE\xB0\xCA\xC0ɮ\xD7..."
-#: Merge.rc:2106
+#: Merge.rc:2110
#, c-format
msgid "Creating the report..."
msgstr "\xA5\xBF\xB2\xA3\xA5ͳ\xF8\xA7i..."
-#: Merge.rc:2107
+#: Merge.rc:2111
#, c-format
msgid "Undoing the last operation..."
msgstr "\xBAM\xA6^\xA4W\xA6\xB8\xAA\xBA\xBEާ@..."
-#: Merge.rc:2108
+#: Merge.rc:2112
#, c-format
msgid "Redoing the previous operation..."
msgstr "\xA6A\xB0\xB5\xA4W\xA6\xB8\xAA\xBA\xBEާ@..."
-#: Merge.rc:2114
+#: Merge.rc:2118
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "\xA6\xE6\xA1G%s \xC4\xE6\xA1G%d/%d \xA6r\xA4\xB8\xA1G%d/%d \xA6楽\xA1G%s"
-#: Merge.rc:2115
+#: Merge.rc:2119
#, c-format
msgid "Line: %s"
msgstr "\xA6\xE6\xA1G %s"
-#: Merge.rc:2116
+#: Merge.rc:2120
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "\xA6\xE6\xA1G%s \xC4\xE6\xA1G%d/%d \xA6r\xA4\xB8\xA1G%d/%d"
-#: Merge.rc:2117
+#: Merge.rc:2121
#, c-format
msgid "Merge"
msgstr "\xA6X\xA8\xD6"
-#: Merge.rc:2118
+#: Merge.rc:2122
#, c-format
msgid "Difference %1 of %2"
msgstr "%2 \xADӮt\xB2\xA7\xA4\xA4\xA4\xA7\xB2\xC4 %1"
-#: Merge.rc:2119
+#: Merge.rc:2123
#, c-format
msgid "%1 Differences Found"
msgstr "\xA7\xE4\xA8\xEC %1 \xADӮt\xB2\xA7"
-#: Merge.rc:2120
+#: Merge.rc:2124
#, c-format
msgid "1 Difference Found"
msgstr "\xA7\xE4\xA8\xEC 1 \xADӮt\xB2\xA7"
#. Abbreviation from "Read Only"
-#: Merge.rc:2121
+#: Merge.rc:2125
#, c-format
msgid "RO"
msgstr "RO"
-#: Merge.rc:2127
+#: Merge.rc:2131
#, c-format
msgid "Item %1 of %2"
msgstr "%2 \xADӶ\xB5\xA5ؤ\xA7\xB2\xC4 %1"
-#: Merge.rc:2128
+#: Merge.rc:2132
#, c-format
msgid "Items: %1"
msgstr "\xB6\xB5\xA5ءG%1"
-#: Merge.rc:2134
+#: Merge.rc:2138
#, c-format
msgid "Select two existing folders or files to compare"
msgstr "\xBF\xEF\xA8\xFA\xA8\xE2\xADӲ{\xA6s\xB8\xEA\xAEƧ\xA8\xA9\xCE\xC0ɮװ\xB5\xA4\xF1\xB9\xEF"
-#: Merge.rc:2135
+#: Merge.rc:2139
#, c-format
msgid "Folder Selection"
msgstr "\xB8\xEA\xAEƧ\xA8\xBF\xEF\xA8\xFA"
-#: Merge.rc:2136
+#: Merge.rc:2140
#, c-format
msgid "Select two folders or two files to compare."
msgstr "\xBF\xEF\xA8\xFA\xA8\xE2\xADӸ\xEA\xAEƧ\xA8\xA9\xCE\xC0ɮװ\xB5\xA4\xF1\xB9\xEF\xA1C"
-#: Merge.rc:2137
+#: Merge.rc:2141
#, c-format
msgid "Left path is invalid!"
msgstr "\xA5\xAA\xC3\xE4\xB8\xF4\xAE|\xB5L\xAEġI"
-#: Merge.rc:2138
+#: Merge.rc:2142
#, c-format
msgid "Right path is invalid!"
msgstr "\xA5k\xC3\xE4\xB8\xF4\xAE|\xB5L\xAEġI"
-#: Merge.rc:2139
+#: Merge.rc:2143
#, c-format
msgid "Both paths are invalid!"
msgstr "\xA8\xE2\xC3\xE4\xB8\xF4\xAE|\xB5L\xAEġI"
-#: Merge.rc:2140
+#: Merge.rc:2144
#, c-format
msgid "Choose two files to enable unpacker selection."
msgstr "\xBF\xEF\xA8\xE2\xC0ɥH\xB1ҥθѥ]\xBE\xB9\xBF\xEF\xA8\xFA\xA1C"
-#: Merge.rc:2141
+#: Merge.rc:2145
#, c-format
msgid "Cannot compare file and folder!"
msgstr "\xB5L\xAAk\xA4\xF1\xB8\xFB\xC0ɮשM\xB8\xEA\xAEƧ\xA8\xA1I"
-#: Merge.rc:2147
+#: Merge.rc:2151
#, c-format
msgid "File not found: %1"
msgstr "\xA7䤣\xA8\xEC\xC0ɮסG%1"
-#: Merge.rc:2148
+#: Merge.rc:2152
#, c-format
msgid "File not unpacked: %1"
msgstr "\xA5\xBC\xB8ѥ]\xAA\xBA\xC0ɮסG%1"
-#: Merge.rc:2149
+#: Merge.rc:2153
#, c-format
msgid ""
"Cannot open file\n"
@@ -3773,12 +3795,12 @@
"\n"
"%2"
-#: Merge.rc:2150
+#: Merge.rc:2154
#, c-format
msgid "Failed to parse conflict file."
msgstr "\xB5L\xAAk\xB8ѪR\xBDĬ\xF0\xC0ɡC"
-#: Merge.rc:2151
+#: Merge.rc:2155
#, c-format
msgid ""
"The file\n"
@@ -3789,32 +3811,32 @@
"%1\n"
"\xA4\xA3\xACO\xBDĬ\xF0\xC0ɡC"
-#: Merge.rc:2157
+#: Merge.rc:2161
#, c-format
msgid "Save As"
msgstr "\xA5t\xA6s\xB7s\xC0\xC9"
-#: Merge.rc:2158
+#: Merge.rc:2162
#, c-format
msgid "Save changes to %1?"
msgstr "\xC0x\xA6s\xA7\xF3\xA7\xEF\xA8\xEC %1\xA1H"
-#: Merge.rc:2159
+#: Merge.rc:2163
#, c-format
msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
msgstr "%1 \xA4w\xBCаO\xA6\xA8\xB0\xDFŪ\xA1C\xA7A\xADn\xC2мg\xB0\xDFŪ\xC0ɶܡH (\xA7_\xA1A\xABh\xA5H\xB7s\xC0ɦW\xC0x\xA6s)"
-#: Merge.rc:2160
+#: Merge.rc:2164
#, c-format
msgid "Error checking destination writeability"
msgstr "\xC0ˬd\xA5ؼмg\xA4J\xA9ʮɵo\xA5Ϳ\xF9\xBB~"
-#: Merge.rc:2161
+#: Merge.rc:2165
#, c-format
msgid "Error backing up file"
msgstr "\xB3ƥ\xF7\xC0ɮɵo\xA5Ϳ\xF9\xBB~"
-#: Merge.rc:2163
+#: Merge.rc:2167
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -3827,7 +3849,7 @@
"\n"
"\xA4\xB4\xC2\xC2\xC4~\xC4\xF2\xB6ܡH"
-#: Merge.rc:2164
+#: Merge.rc:2168
#, c-format
msgid ""
"Saving file failed.\n"
@@ -3844,7 +3866,7 @@
"\t-\xA5H\xA4\xA3\xA6P\xA6W\xBA\xD9\xC0x\xA6s\xC0ɮ\xD7 (\xAB\xF6\xA1u\xBDT\xA9w\xA1v)\n"
"\t-\xA9\xF1\xB1\xF3\xA5ثe\xBEާ@(\xAB\xF6\xA1u\xA8\xFA\xAE\xF8\xA1v)\xA1H"
-#: Merge.rc:2165
+#: Merge.rc:2169
#, c-format
msgid ""
"Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -3859,7 +3881,7 @@
"\n"
"\xADn\xC0x\xA6s\xB8ѥ]\xAA\xA9\xA6\xA8\xA5t\xA4@\xC0ɮܡH"
-#: Merge.rc:2166
+#: Merge.rc:2170
#, c-format
msgid ""
"Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -3874,7 +3896,7 @@
"\n"
"\xA7A\xADn\xC0x\xA6s\xB8ѫʥ]\xAA\xA9\xA5\xBB\xAC\xB0\xA5t\xA4@\xC0ɮܡH"
-#: Merge.rc:2167
+#: Merge.rc:2171
#, c-format
msgid ""
"Another application has updated file\n"
@@ -3889,7 +3911,7 @@
"\n"
"\xADn\xC2мg\xA8\xBA\xA7\xF3\xB7s\xB9L\xAA\xBA\xC0ɮܡH"
-#: Merge.rc:2168
+#: Merge.rc:2172
#, c-format
msgid ""
"%1\n"
@@ -3898,7 +3920,7 @@
"%1\n"
"\xA4w\xBCаO\xA6\xA8\xB0\xDFŪ\xA1C\xA4\xB4\xADn\xC2мg\xA5\xA6\xB6ܡH"
-#: Merge.rc:2169
+#: Merge.rc:2173
#, c-format
msgid ""
"Another application has updated file\n"
@@ -3913,17 +3935,17 @@
"\n"
"\xADn\xAD\xAB\xB7s\xB8\xFC\xA4J\xA5\xA6\xB6ܡH"
-#: Merge.rc:2170
+#: Merge.rc:2174
#, c-format
msgid "Save Left File As"
msgstr "\xC0x\xA6s\xA5\xAA\xC3\xE4\xC0ɮ\xB0"
-#: Merge.rc:2171
+#: Merge.rc:2175
#, c-format
msgid "Save Right File As"
msgstr "\xC0x\xA6s\xA5k\xC3\xE4\xC0ɮ\xB0"
-#: Merge.rc:2172
+#: Merge.rc:2176
#, c-format
msgid ""
"The file\n"
@@ -3934,7 +3956,7 @@
"%1\n"
"\xAE\xF8\xA5\xA2\xA1C\xBD\xD0\xC0x\xA6s\xC0ɮװƥ\xBB\xA6A\xC4~\xC4\xF2\xA1C"
-#: Merge.rc:2178
+#: Merge.rc:2182
#, c-format
msgid ""
"Cannot merge differences when documents are not in synch.\n"
@@ -3942,42 +3964,42 @@
"Refresh documents before continuing."
msgstr "\xA6p\xA5\xBC\xAD\xAB\xBE\xE3\xC0ɮסAWinMerge \xA4\xA3\xAF\xE0\xA8֤J\xB2\xA7\xB0ʡC"
-#: Merge.rc:2184
+#: Merge.rc:2188
#, c-format
msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
msgstr "\xA4@\xA9w\xB1o\xAB\xFC\xA9w\xA4@\xAD\xD3 SourceSafe \xB1M\xAE\xF4\xAE|\xA4~\xAF\xE0\xC4~\xC4\xF2 (\xA8Ҧp\xA1G $/MyProject)"
-#: Merge.rc:2185
+#: Merge.rc:2189
#, c-format
msgid "Checkout files from VSS..."
msgstr "\xA5\xD1 VSS \xA8\xFA\xA5X\xC0ɮ\xD7..."
-#: Merge.rc:2186
+#: Merge.rc:2190
#, c-format
msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
msgstr "\xB0e\xA6^\xA7\xEF\xB9L\xC0ɮɡA\xAA\xA9\xA5\xBB\xA8t\xB2Φ^\xB3\xF8\xA4@\xADӿ\xF9\xBB~\xA1C\xB5L\xAAk\xC4~\xC4\xF2..."
-#: Merge.rc:2187
+#: Merge.rc:2191
#, c-format
msgid "Error executing versioning system command."
msgstr "\xB0\xF5\xA6檩\xA5\xBB\xA8t\xB2Ϋ\xFC\xA5O\xAEɵo\xA5Ϳ\xF9\xBB~\xA1C"
-#: Merge.rc:2188
+#: Merge.rc:2192
#, c-format
msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
msgstr "VSS \xA7@\xB7~\xB8\xEA\xAEƧ\xA8\xA9M\xA5ثe\xC0ɮצ\xEC\xB8m\xA4\xA3\xB2ŦX\xA1C\xADn\xC4~\xC4\xF2\xB6ܡH"
-#: Merge.rc:2189
+#: Merge.rc:2193
#, c-format
msgid "No VSS database(s) found!"
msgstr "\xA7䤣\xA8\xEC VSS \xB8\xEA\xAEƮw\xA1I"
-#: Merge.rc:2190
+#: Merge.rc:2194
#, c-format
msgid "Error from VSS:"
msgstr "VSS \xB5o\xA5Ϳ\xF9\xBB~\xA1G"
-#: Merge.rc:2191
+#: Merge.rc:2195
#, c-format
msgid ""
"Versioning System returned an error while attempting to check in the file.\n"
@@ -3988,7 +4010,7 @@
" \xBD\xD0\xC0ˬd\xC0˵\xF8\xB9L\xAB᪺\xB2պA\xA1C\n"
" \xBAM\xA6^\xA8\xFA\xA5X\xA1H"
-#: Merge.rc:2192
+#: Merge.rc:2196
#, c-format
msgid ""
"Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -3997,169 +4019,169 @@
"\xBAM\xA6^\xA8\xFA\xA5X\xC0ɮɡA\xAA\xA9\xA5\xBB\xA8t\xB2Φ^\xB3\xF8\xA4@\xADӿ\xF9\xBB~\xA1C\n"
" \xBD\xD0\xC0ˬd\xC0˵\xF8\xB9L\xAB᪺\xB2պA\xA1C"
-#: Merge.rc:2198
-#: Merge.rc:2651
+#: Merge.rc:2202
+#: Merge.rc:2556
#, c-format
msgid "None"
msgstr "\xB5L"
-#: Merge.rc:2199
+#: Merge.rc:2203
#, c-format
msgid "Visual SourceSafe (less than 5.0)"
msgstr "Visual SourceSafe (\xA6\xAD\xA9\xF3 5.0 \xAA\xA9)"
-#: Merge.rc:2200
+#: Merge.rc:2204
#, c-format
msgid "Visual SourceSafe (5.0 and above)"
msgstr "Visual SourceSafe (5.0 \xAA\xA9\xA9M\xA7\xF3\xB1ߪ\xBA\xAA\xA9\xA5\xBB)"
-#: Merge.rc:2202
+#: Merge.rc:2206
#, c-format
msgid "Break at whitespace"
msgstr "\xAAťճB\xA4\xA4\xC2_"
-#: Merge.rc:2203
+#: Merge.rc:2207
#, c-format
msgid "Break at whitespace or punctuation"
msgstr "\xAAťճB\xA9μ\xD0\xC2I\xB3B\xA4\xA4\xC2_"
-#: Merge.rc:2209
-#: Merge.rc:2211
+#: Merge.rc:2213
+#: Merge.rc:2215
#, c-format
msgid "Copy selected item to named directory"
msgstr "\xBDƻs\xBF\xEF\xA8\xFA\xB6\xB5\xA8\xECnamed \xA5ؿ\xFD"
-#: Merge.rc...
[truncated message content] |
|
From: <ge...@us...> - 2010-02-12 16:47:56
|
Revision: 7122
http://winmerge.svn.sourceforge.net/winmerge/?rev=7122&view=rev
Author: gerundt
Date: 2010-02-12 16:47:48 +0000 (Fri, 12 Feb 2010)
Log Message:
-----------
Web: Add link to WinMerge Facebook group
Modified Paths:
--------------
trunk/Web/links.php
Modified: trunk/Web/links.php
===================================================================
--- trunk/Web/links.php 2010-02-06 14:09:37 UTC (rev 7121)
+++ trunk/Web/links.php 2010-02-12 16:47:48 UTC (rev 7122)
@@ -42,6 +42,8 @@
<dd><?php __e('Inside informations, unreleased products and articles on various soon-to-be-released software titles.');?></dd>
<dt><a href="http://portableapps.com/apps/utilities/winmerge_portable"><?php __e('WinMerge Portable');?></a></dt>
<dd><?php __e('This is WinMerge packaged with a PortableApps.com Launcher as a <a href="%s">portable app</a>, so you can compare files on the go.', 'http://portableapps.com/about/what_is_a_portable_app');?></dd>
+ <dt><a href="http://www.facebook.com/group.php?gid=13326170958"><?php __e('WinMerge Facebook Group');?></a></dt>
+ <dd><?php __e('A <a href="%s">Facebook</a> group for people interested in WinMerge.', 'http://www.facebook.com/');?></dd>
</dl>
<?php
$page->printFoot();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-02-06 18:19:46
|
Revision: 7118
http://winmerge.svn.sourceforge.net/winmerge/?rev=7118&view=rev
Author: gerundt
Date: 2010-02-06 12:35:23 +0000 (Sat, 06 Feb 2010)
Log Message:
-----------
Drop "MakePatchDirs" section from readme-developers.html
Modified Paths:
--------------
trunk/Docs/Developers/readme-developers.html
Modified: trunk/Docs/Developers/readme-developers.html
===================================================================
--- trunk/Docs/Developers/readme-developers.html 2010-02-01 14:24:51 UTC (rev 7117)
+++ trunk/Docs/Developers/readme-developers.html 2010-02-06 12:35:23 UTC (rev 7118)
@@ -52,7 +52,6 @@
<h3>Table of Contents</h3>
<ol>
<li><a href="#Code_changes">Code changes</a></li>
- <li><a href="#MakePatchDirs">MakePatchDirs</a></li>
<li><a href="#Minor_code_changes_and_bug_fixes">Minor code changes and bug fixes</a></li>
<li><a href="#Coding_conventions">Coding conventions</a></li>
<li><a href="#Doxygen_comments">Doxygen comments</a></li>
@@ -151,12 +150,6 @@
subfolders have their own <code>Changes.txt</code> -file. If the file exists in the folder, it must be
used instead of "global" <code>Src/Changes.txt</code>.
-<h3><a name="MakePatchDirs">MakePatchDirs</a></h3>
-
-<p>Perry wrote a small program called
-<a href="readme-developers-MakePatchDirs.html">MakePatchDirs</a>, which helps
-in his patch process -- read the link for more information.</p>
-
<h3><a name="Minor_code_changes_and_bug_fixes">Minor code changes and bug fixes</a></h3>
<p>It is reasonable to post small snippets of code showing small changes
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-02-06 14:09:43
|
Revision: 7121
http://winmerge.svn.sourceforge.net/winmerge/?rev=7121&view=rev
Author: gerundt
Date: 2010-02-06 14:09:37 +0000 (Sat, 06 Feb 2010)
Log Message:
-----------
PATCH: [ 2943964 ] A Swedish Swedish.isl and sv.po translation update
Submitted by Hans Eriksson
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Translations/InnoSetup/Swedish.isl
trunk/Translations/Web/sv.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-02-06 13:23:09 UTC (rev 7120)
+++ trunk/Docs/Users/ChangeLog.txt 2010-02-06 14:09:37 UTC (rev 7121)
@@ -6,6 +6,7 @@
WinMerge 2.13.12
Translation updates:
- Slovenian (#2934354)
+ - Swedish (#2943964)
WinMerge 2.13.11 - 2010-01-15 (r7111)
Write config log as UTF-8 file (r7057)
Modified: trunk/Translations/InnoSetup/Swedish.isl
===================================================================
--- trunk/Translations/InnoSetup/Swedish.isl 2010-02-06 13:23:09 UTC (rev 7120)
+++ trunk/Translations/InnoSetup/Swedish.isl 2010-02-06 14:09:37 UTC (rev 7121)
@@ -343,7 +343,7 @@
JapaneseLanguage=Japanska menyer och dialoger
KoreanLanguage=Koreanska menyer och dialoger
NorwegianLanguage=Norska menyer och dialoger
-PersianLanguage=Persian menus and dialogs
+PersianLanguage=Persiska menyer och dialoger
PolishLanguage=Polska menyer och dialoger
PortugueseBrazilLanguage=Portugisiska (Brasiliansk) menyer och dialoger
PortugueseLanguage=Portugisiska menyer och dialoger
Modified: trunk/Translations/Web/sv.po
===================================================================
--- trunk/Translations/Web/sv.po 2010-02-06 13:23:09 UTC (rev 7120)
+++ trunk/Translations/Web/sv.po 2010-02-06 14:09:37 UTC (rev 7121)
@@ -12,7 +12,7 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2009-08-31 00:43+0100\n"
+"PO-Revision-Date: 2010-02-01 19:11 +0100\n"
"Last-Translator: Hans Eriksson <hans.ericson at bredband.net>\n"
"Language-Team: Swedish <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -108,7 +108,7 @@
#: links.php:27
#, c-format
msgid "Good site devoted for regular expressions"
-msgstr ""
+msgstr "Bra hemsida tillägnad reguljära uttryck"
#: index.php:45
#, c-format
@@ -180,7 +180,7 @@
#: links.php:31
#, c-format
msgid "Regular expressions tutorial"
-msgstr ""
+msgstr "Reguljära uttryck instruktion"
#: support\tracker-shortcuts.php:55
#, c-format
@@ -398,12 +398,12 @@
#: links.php:18
#, c-format
msgid "<b>External diff Tool</b> is an <a href=\"%s\">Eclipse</a> Plugin</a> that allows the launch of WinMerge (or an other external diff tool) for file compares rather than the default built-in Eclipse diff tool."
-msgstr ""
+msgstr "<b>Externt skillnadsverktyg</b> är en <a href=\"%s\">Eclipse</a> Plugin</a> som tillåter start av WinMerge (eller ett annat externt skillnadsverktyg) för filjämförelser i stället för det standardinbyggda Eclipse skillnadsverktyget."
#: links.php:22
#, c-format
msgid "<b>Frhed</b> is an binary file editor for Windows. It is small but has many advanced features like ability to load big files partially."
-msgstr ""
+msgstr "<b>Frhed</b> är en binär fileditor för Windows. Den är liten men har många avancerade fuktioner som möjlighet att öppna stora filer delvis."
#: support\tracker-shortcuts.php:16
#, c-format
@@ -598,7 +598,7 @@
#: links.php:40
#, c-format
msgid "Reviews of popular comparison software. [<a href=\"%s\">WinMerge Review</a>]"
-msgstr ""
+msgstr "Recentioner av populära jämförelseprogram [<a href=\"%s\">WinMerge Recentioner</a>]"
#: engine\page.inc:311
#, c-format
@@ -623,7 +623,7 @@
#: engine\page.inc:307
#, c-format
msgid "WinMerge Quick Tour"
-msgstr ""
+msgstr "WinMerge Snabbguide"
#: 404.php:11
#, c-format
@@ -633,7 +633,7 @@
#: links.php:29
#, c-format
msgid "Good HOWTO document for regular expressions"
-msgstr ""
+msgstr "Bra INSTRUERANDE dokument för reguljära uttryck"
#: index.php:16
#, c-format
@@ -660,7 +660,7 @@
#: links.php:35
#, c-format
msgid "Miscellaneous"
-msgstr ""
+msgstr "Diverse"
#: support\index.php:38
#, c-format
@@ -721,7 +721,7 @@
#: engine\page.inc:307
#, c-format
msgid "Quick Tour"
-msgstr ""
+msgstr "Snabbguide"
#: translations\index.php:29
#, c-format
@@ -765,7 +765,7 @@
#: links.php:24
#, c-format
msgid "Regular expressions"
-msgstr ""
+msgstr "Reguljära uttryck"
#: translations\translations_branch.inc:183
#, c-format
@@ -800,7 +800,7 @@
#: links.php:20
#, c-format
msgid "<b>TortoiseSVN</b> lets you work with files under <em>Subversion</em> version control directly from Windows Explorer."
-msgstr ""
+msgstr "<b>TortoiseSVN</b> låter dig arbeta med filer under <em>Subversion</em> versionskontroll direkt från Windows Explorer."
#: about\license.php:6
#, c-format
@@ -826,7 +826,7 @@
#: links.php:42
#, c-format
msgid "Inside informations, unreleased products and articles on various soon-to-be-released software titles."
-msgstr ""
+msgstr "Inside information, osläppta produkter och artiklar om diverse snart släppta programtitlar."
#: support\tracker-shortcuts.php:23
#, c-format
@@ -841,7 +841,7 @@
#: links.php:38
#, c-format
msgid "Map the open source world by collecting objective information on open source projects. [<a href=\"%s\">WinMerge Report</a>]"
-msgstr ""
+msgstr "Kartlägg Open source-världen genom att samla objektiv information om Open source-projekt. [<a href=\"%s\">WinMerge Rapport</a>]"
#: downloads\plugins.php:32
#, c-format
@@ -906,7 +906,7 @@
#: links.php:44
#, c-format
msgid "This is WinMerge packaged with a PortableApps.com Launcher as a <a href=\"%s\">portable app</a>, so you can compare files on the go."
-msgstr ""
+msgstr "Detta är WinMerge paketterat med en PortableApps.com startare som en <a href=\"%s\">portabel applikation</a>, så du kan jämföra filer direkt."
#: index.php:47
#, c-format
@@ -978,7 +978,7 @@
#: links.php:30
#, c-format
msgid "Tutorial"
-msgstr ""
+msgstr "Instruktion"
#: about\index.php:78
#, c-format
@@ -1307,7 +1307,7 @@
#: links.php:28
#, c-format
msgid "regex HOWTO"
-msgstr ""
+msgstr "reguljära uttryck INSTRUKTION"
#: about\license.php:10
#, c-format
@@ -1379,7 +1379,7 @@
#: links.php:33
#, c-format
msgid "PDF quick reference"
-msgstr ""
+msgstr "PDF snabbreferens"
#: docs\index.php:11
#, c-format
@@ -1468,7 +1468,7 @@
#: docs\index.php:6
#, c-format
msgid "WinMerge, documentation, manual, quick tour, release notes, known issues, change log, Development Wiki"
-msgstr ""
+msgstr "WinMerge, dokumentation, manual, snabbguide, releasenoteringar, kända problem, ändringslogg, Development Wiki"
#: support\mailing-lists.php:24
#: support\mailing-lists.php:34
@@ -1548,7 +1548,7 @@
#: links.php:7
#, c-format
msgid "Here is a collection of links to tools and reference material that we find is generally useful when you work with WinMerge."
-msgstr ""
+msgstr "Här finns en samling länkar till verktyg och referensmaterial som vi generellt finner användbart när du arbetar med WinMerge. "
#: support\index.php:7
#, c-format
@@ -1722,7 +1722,7 @@
#: links.php:16
#, c-format
msgid "<b>GnuWin32</b> provides Win32 ports of tools with a <a href=\"%1$s\">GNU</a> or similar <a href=\"%2$s\">open source license</a>."
-msgstr ""
+msgstr "<b>GnuWin32</b> har Win32 portar av verktyg med en <a href=\"%1$s\">GNU</a> eller liknande <a href=\"%2$s\">open source license</a>."
#: engine\page.inc:308
#, c-format
@@ -1758,12 +1758,12 @@
#: links.php:14
#, c-format
msgid "<b>WinSCP</b> is an open source <acronym title=\"SSH File Transfer Protocol\">SFTP</acronym>, <acronym title=\"File Transfer Protocol\">FTP</acronym> and <acronym title=\"Secure Copy Protocol\">SCP</acronym> client for Windows."
-msgstr ""
+msgstr "<b>WinSCP</b> är en open source <acronym title=\"SSH Filöverföringsprotokoll\">SFTP</acronym>, <acronym title=\"Filöverföringsprotokoll\">FTP</acronym> och <acronym title=\"Säkert Kopieringsprotokoll\">SCP</acronym> client för Windows."
#: links.php:12
#, c-format
msgid "<b>7-Zip</b> is a file archiver with high compression ratio."
-msgstr ""
+msgstr "b>7-Zip</b> är en filkomprimerare med en hög kompressionsgrad."
#: about\index.php:5
#: about\index.php:12
@@ -1774,12 +1774,12 @@
#: docs\index.php:13
#, c-format
msgid "The <a href=\"%s\">quick tour</a> describe the main features from WinMerge at one page."
-msgstr ""
+msgstr "<a href=\"%s\">Snabbguiden</a> beskriver de huvudsakliga funktionerna i WinMerge på en sida."
#: engine\engine.inc:22
#, c-format
msgid "Japanese"
-msgstr ""
+msgstr "Japanska"
#: downloads\source-code.php:7
#: downloads\source-code.php:10
@@ -1849,7 +1849,7 @@
#: links.php:9
#, c-format
msgid "Tools"
-msgstr ""
+msgstr "Verktyg"
#: engine\page.inc:381
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-02-06 13:23:20
|
Revision: 7120
http://winmerge.svn.sourceforge.net/winmerge/?rev=7120&view=rev
Author: gerundt
Date: 2010-02-06 13:23:09 +0000 (Sat, 06 Feb 2010)
Log Message:
-----------
Drop "MakePatchDirs" from SVN_Organisation.txt
Modified Paths:
--------------
trunk/Docs/Developers/SVN_Organisation.txt
Modified: trunk/Docs/Developers/SVN_Organisation.txt
===================================================================
--- trunk/Docs/Developers/SVN_Organisation.txt 2010-02-06 13:00:14 UTC (rev 7119)
+++ trunk/Docs/Developers/SVN_Organisation.txt 2010-02-06 13:23:09 UTC (rev 7120)
@@ -40,7 +40,6 @@
- selftests
- Tools
- diff2winmerge
- - MakePatchDirs
- Translations
- Docs
- InnoSetup
@@ -156,18 +155,12 @@
- Tests using Perl run WinMerge executable to test compare functionality.
WinMerge/Tools/
- - Tools needed/used with WinMerge development (e.g. language file compiler).
+ - Tools needed/used with WinMerge development.
WinMerge/Tools/diff2winmerge/
- Commandline wrapper for WinMerge executable, offers
diffutils -style commandline switches (needed by Perl selftests).
-WinMerge/Tools/MakePatchDirs/
- - Source files for MakePatchDirs, a program to generate original &
- altered directories
- - Used to create patches to WinMerge source tree, for upload to
- sourceforge patch board
-
WinMerge/Translations
- Translation files for WinMerge components and documents
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
