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: <jt...@us...> - 2010-07-03 13:03:05
|
Revision: 7219
http://winmerge.svn.sourceforge.net/winmerge/?rev=7219&view=rev
Author: jtuc
Date: 2010-07-03 13:02:59 +0000 (Sat, 03 Jul 2010)
Log Message:
-----------
Remove unwanted copy-paste leftovers
Modified Paths:
--------------
trunk/Src/HexMergeDoc.h
Modified: trunk/Src/HexMergeDoc.h
===================================================================
--- trunk/Src/HexMergeDoc.h 2010-07-01 15:40:16 UTC (rev 7218)
+++ trunk/Src/HexMergeDoc.h 2010-07-03 13:02:59 UTC (rev 7219)
@@ -25,7 +25,6 @@
// RCS ID line follows -- this is updated by CVS
// $Id$
-#include "TempFile.h"
#include "PathContext.h"
#include "DiffFileInfo.h"
@@ -80,7 +79,6 @@
protected:
CHexMergeView * m_pView[MERGE_VIEW_COUNT]; /**< Pointer to left/right view */
CDirDoc * m_pDirDoc;
- TempFile m_tempFiles[2]; /**< Temp files for compared files */
String m_strDesc[2]; /**< Left/right side description text */
BUFFERTYPE m_nBufferType[2];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-07-01 15:40:23
|
Revision: 7218
http://winmerge.svn.sourceforge.net/winmerge/?rev=7218&view=rev
Author: kimmov
Date: 2010-07-01 15:40:16 +0000 (Thu, 01 Jul 2010)
Log Message:
-----------
Fixing 64-bit build warnings.
Modified Paths:
--------------
trunk/Src/ChildFrm.cpp
trunk/Src/Common/CMoveConstraint.cpp
trunk/Src/Common/CMoveConstraint.h
trunk/Src/Common/MessageBoxDialog.h
trunk/Src/Common/PropertyPageHost.cpp
trunk/Src/Common/PropertyPageHost.h
trunk/Src/Merge.cpp
trunk/Src/MovedBlocks.cpp
Modified: trunk/Src/ChildFrm.cpp
===================================================================
--- trunk/Src/ChildFrm.cpp 2010-07-01 14:54:51 UTC (rev 7217)
+++ trunk/Src/ChildFrm.cpp 2010-07-01 15:40:16 UTC (rev 7218)
@@ -326,7 +326,7 @@
*/
BOOL CChildFrame::EnsureValidDockState(CDockState& state)
{
- for (int i = state.m_arrBarInfo.GetSize()-1 ; i >= 0; i--)
+ for (int i = (int) state.m_arrBarInfo.GetSize()-1 ; i >= 0; i--)
{
BOOL barIsCorrect = TRUE;
CControlBarInfo* pInfo = (CControlBarInfo*)state.m_arrBarInfo[i];
Modified: trunk/Src/Common/CMoveConstraint.cpp
===================================================================
--- trunk/Src/Common/CMoveConstraint.cpp 2010-07-01 14:54:51 UTC (rev 7217)
+++ trunk/Src/Common/CMoveConstraint.cpp 2010-07-01 15:40:16 UTC (rev 7218)
@@ -626,7 +626,7 @@
bool
CMoveConstraint::OnTtnNeedText(TOOLTIPTEXT * pTTT, LRESULT * plresult)
{
- UINT id = pTTT->hdr.idFrom;
+ UINT_PTR id = pTTT->hdr.idFrom;
UINT uflags = pTTT->uFlags;
if (uflags & TTF_IDISHWND)
id = GetDlgCtrlID((HWND)id);
Modified: trunk/Src/Common/CMoveConstraint.h
===================================================================
--- trunk/Src/Common/CMoveConstraint.h 2010-07-01 14:54:51 UTC (rev 7217)
+++ trunk/Src/Common/CMoveConstraint.h 2010-07-01 15:40:16 UTC (rev 7218)
@@ -249,7 +249,7 @@
CString m_sRegistrySubkey; // defaults to _T("LastWindowPos")
CString m_sRegistryValueName; // should be name of window
// tooltips
- CMap<UINT, UINT, tip, tip&> m_tips;
+ CMap<UINT_PTR, UINT_PTR, tip, tip&> m_tips;
};
} // namespace
Modified: trunk/Src/Common/MessageBoxDialog.h
===================================================================
--- trunk/Src/Common/MessageBoxDialog.h 2010-07-01 14:54:51 UTC (rev 7217)
+++ trunk/Src/Common/MessageBoxDialog.h 2010-07-01 15:40:16 UTC (rev 7218)
@@ -204,7 +204,7 @@
UINT m_nTimeoutSeconds; // Seconds for a timeout.
BOOL m_bTimeoutDisabled; // Flag whether the timeout is disabled.
- UINT m_nTimeoutTimer; // Timer for the timeout.
+ UINT_PTR m_nTimeoutTimer; // Timer for the timeout.
CString m_strRegistryKey; // Entry for storing the result in the
// registry, if the MB_DONT_DISPLAY_AGAIN
Modified: trunk/Src/Common/PropertyPageHost.cpp
===================================================================
--- trunk/Src/Common/PropertyPageHost.cpp 2010-07-01 14:54:51 UTC (rev 7217)
+++ trunk/Src/Common/PropertyPageHost.cpp 2010-07-01 15:40:16 UTC (rev 7218)
@@ -200,7 +200,7 @@
if (FindPage(pPage) == -1)
{
PAGEITEM pi(pPage, szTitle, dwItemData);
- int nPage = m_aPages.Add(pi);
+ int nPage = (int) m_aPages.Add(pi);
if (szTitle)
{
@@ -214,7 +214,7 @@
int CPropertyPageHost::FindPage(CPropertyPage* pPage)
{
- int nPage = m_aPages.GetSize();
+ int nPage = (int) m_aPages.GetSize();
while (nPage--)
{
@@ -310,7 +310,7 @@
void CPropertyPageHost::OnOK()
{
- int nPage = m_aPages.GetSize();
+ int nPage = (int) m_aPages.GetSize();
while (nPage--)
{
@@ -329,7 +329,7 @@
*/
void CPropertyPageHost::UpdatePagesData()
{
- int nPage = m_aPages.GetSize();
+ int nPage = (int) m_aPages.GetSize();
while (nPage--)
{
@@ -384,7 +384,7 @@
CPropertyPage* CPropertyPageHost::FindPage(DWORD dwItemData)
{
- int nPage = m_aPages.GetSize();
+ int nPage = (int) m_aPages.GetSize();
while (nPage--)
{
Modified: trunk/Src/Common/PropertyPageHost.h
===================================================================
--- trunk/Src/Common/PropertyPageHost.h 2010-07-01 14:54:51 UTC (rev 7217)
+++ trunk/Src/Common/PropertyPageHost.h 2010-07-01 15:40:16 UTC (rev 7218)
@@ -48,7 +48,7 @@
BOOL AddPage(CPropertyPage* pPage, LPCTSTR szTitle = NULL, DWORD dwItemData = 0);
BOOL SetActivePage(int nIndex, BOOL bAndFocus = TRUE);
BOOL SetActivePage(CPropertyPage* pPage, BOOL bAndFocus = TRUE);
- int GetPageCount() { return m_aPages.GetSize(); }
+ int GetPageCount() { return (int) m_aPages.GetSize(); }
CString GetPageTitle(int nIndex);
DWORD GetPageItemData(int nIndex);
CPropertyPage* GetPage(int nIndex);
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2010-07-01 14:54:51 UTC (rev 7217)
+++ trunk/Src/Merge.cpp 2010-07-01 15:40:16 UTC (rev 7218)
@@ -510,7 +510,7 @@
nIDPrompt);
// Display the message box dialog and return the result.
- return dlgMessage.DoModal();
+ return (int) dlgMessage.DoModal();
}
/**
Modified: trunk/Src/MovedBlocks.cpp
===================================================================
--- trunk/Src/MovedBlocks.cpp 2010-07-01 14:54:51 UTC (rev 7217)
+++ trunk/Src/MovedBlocks.cpp 2010-07-01 15:40:16 UTC (rev 7218)
@@ -31,7 +31,7 @@
public:
void Add(int val) { m_map.SetAt(val, 1); }
void Remove(int val) { m_map.RemoveKey(val); }
- int count() const { return m_map.GetCount(); }
+ int count() const { return (int) m_map.GetCount(); }
bool isPresent(int val) const { int parm; return !!m_map.Lookup(val, parm); }
int getSingle() const
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-07-01 14:54:58
|
Revision: 7217
http://winmerge.svn.sourceforge.net/winmerge/?rev=7217&view=rev
Author: kimmov
Date: 2010-07-01 14:54:51 +0000 (Thu, 01 Jul 2010)
Log Message:
-----------
Fixing 64-bit build warnings.
Modified Paths:
--------------
trunk/Src/editlib/ccrystaleditview.cpp
trunk/Src/editlib/ccrystaltextbuffer.cpp
trunk/Src/editlib/ccrystaltextview.cpp
trunk/Src/editlib/ccrystaltextview.h
trunk/Src/editlib/ccrystaltextview2.cpp
Modified: trunk/Src/editlib/ccrystaleditview.cpp
===================================================================
--- trunk/Src/editlib/ccrystaleditview.cpp 2010-07-01 13:30:43 UTC (rev 7216)
+++ trunk/Src/editlib/ccrystaleditview.cpp 2010-07-01 14:54:51 UTC (rev 7217)
@@ -495,7 +495,7 @@
ptCursorPos = GetCursorPos ();
ASSERT_VALIDTEXTPOS (ptCursorPos);
LPCTSTR pszText = m_pTextBuffer->GetDefaultEol();
- int cchText = _tcslen(pszText);
+ int cchText = (int) _tcslen(pszText);
int x, y;
m_pTextBuffer->InsertText (this, ptCursorPos.y, ptCursorPos.x, pszText, cchText, y, x, CE_ACTION_TYPING); // [JRT]
@@ -521,7 +521,7 @@
if (QueryEditable () && m_pTextBuffer != NULL)
{
m_pTextBuffer->BeginUndoGroup (m_bMergeUndo);
- m_bMergeUndo = true;
+ m_bMergeUndo = true;
CPoint ptSelStart, ptSelEnd;
GetSelection (ptSelStart, ptSelEnd);
@@ -729,7 +729,7 @@
for (int L = nStartLine; L <= nEndLine; L++)
{
int x, y;
- m_pTextBuffer->InsertText (this, L, 0, pszText, _tcslen(pszText), y, x, CE_ACTION_INDENT); // [JRT]
+ m_pTextBuffer->InsertText (this, L, 0, pszText, (int) _tcslen(pszText), y, x, CE_ACTION_INDENT); // [JRT]
}
m_bHorzScrollBarLocked = FALSE;
@@ -796,12 +796,12 @@
// [JRT]:
m_pTextBuffer->DeleteText (this, ptSelStart.y, ptSelStart.x, ptSelEnd.y, ptSelEnd.x, CE_ACTION_TYPING);
- m_pTextBuffer->InsertText( this, ptSelStart.y, ptSelStart.x, pszText, _tcslen(pszText), y, x, CE_ACTION_TYPING );
+ m_pTextBuffer->InsertText( this, ptSelStart.y, ptSelStart.x, pszText, (int) _tcslen(pszText), y, x, CE_ACTION_TYPING );
}
// No selection, add tab
else
{
- m_pTextBuffer->InsertText (this, ptCursorPos.y, ptCursorPos.x, pszText, _tcslen(pszText), y, x, CE_ACTION_TYPING); // [JRT]
+ m_pTextBuffer->InsertText (this, ptCursorPos.y, ptCursorPos.x, pszText, (int) _tcslen(pszText), y, x, CE_ACTION_TYPING); // [JRT]
}
ptCursorPos.x = x;
@@ -1134,8 +1134,8 @@
return FALSE;
}
- SIZE_T cbData = ::GlobalSize (hData);
- int cchText = cbData / sizeof(TCHAR) - 1;
+ UINT cbData = (UINT) ::GlobalSize (hData);
+ UINT cchText = cbData / sizeof(TCHAR) - 1;
if (cchText < 0)
return FALSE;
LPTSTR pszText = (LPTSTR)::GlobalLock (hData);
@@ -1577,7 +1577,7 @@
{
static LPCTSTR braces = _T("{}()[]<>");
LPCTSTR pos = _tcschr (braces, c);
- return pos ? pos - braces + 1 : 0;
+ return pos ? (int) (pos - braces) + 1 : 0;
}
int
Modified: trunk/Src/editlib/ccrystaltextbuffer.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextbuffer.cpp 2010-07-01 13:30:43 UTC (rev 7216)
+++ trunk/Src/editlib/ccrystaltextbuffer.cpp 2010-07-01 14:54:51 UTC (rev 7217)
@@ -659,7 +659,7 @@
{
LPCTSTR lpEOLtoApply = GetDefaultEol();
BOOL bChanged = FALSE;
- const int size = m_aLines.size();
+ const size_t size = m_aLines.size();
for (int i = 0 ; i < size; i++)
{
// the last real line has no EOL
@@ -935,7 +935,7 @@
memcpy (pszBuf, startLine.GetLine(nStartChar), sizeof (TCHAR) * nCount);
pszBuf += nCount;
}
- text.ReleaseBuffer (pszBuf - text);
+ text.ReleaseBuffer ((int) (pszBuf - text));
text.FreeExtra ();
}
@@ -1834,7 +1834,7 @@
// Start from the end of text
bWrapIt = FALSE;
- nCurrentLine = nSize - 1;
+ nCurrentLine = (int) (nSize - 1);
}
return -1;
}
Modified: trunk/Src/editlib/ccrystaltextview.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextview.cpp 2010-07-01 13:30:43 UTC (rev 7216)
+++ trunk/Src/editlib/ccrystaltextview.cpp 2010-07-01 14:54:51 UTC (rev 7217)
@@ -809,7 +809,7 @@
static void AppendStringAdv(CString & str, int & curpos, LPCTSTR szadd)
{
str += szadd;
- curpos += _tcslen(szadd);
+ curpos += (int) _tcslen(szadd);
}
/** Append escaped control char to string str, and advance position curpos */
@@ -1309,7 +1309,7 @@
return;
if( nLineIndex2 >= m_panSubLines->GetSize() )
- nLineIndex2 = m_panSubLines->GetUpperBound();
+ nLineIndex2 = (int) m_panSubLines->GetUpperBound();
for( int i = nLineIndex1; i <= nLineIndex2; i++ )
if( i >= 0 && i < m_panSubLines->GetSize() )
@@ -4068,7 +4068,7 @@
{
ASSERT (nLineIndex != -1);
// All text below this line should be reparsed
- const int cookiesSize = m_ParseCookies->size();
+ const int cookiesSize = (int) m_ParseCookies->size();
if (cookiesSize > 0)
{
ASSERT (cookiesSize == nLineCount);
@@ -4581,7 +4581,7 @@
ASSERT (pszFindWhere != NULL);
ASSERT (pszFindWhat != NULL);
int nCur = 0;
- int nLength = _tcslen (pszFindWhat);
+ int nLength = (int) _tcslen (pszFindWhat);
nLen = nLength;
for (;;)
{
@@ -4589,20 +4589,20 @@
if (pszPos == NULL)
return -1;
if ((dwFlags & FIND_WHOLE_WORD) == 0)
- return nCur + (pszPos - pszFindWhere);
+ return nCur + (int) (pszPos - pszFindWhere);
if (pszPos > pszFindWhere && xisalnum (pszPos[-1]))
{
- nCur += (pszPos - pszFindWhere + 1);
+ nCur += (int) (pszPos - pszFindWhere + 1);
pszFindWhere = pszPos + 1;
continue;
}
if (xisalnum (pszPos[nLength]))
{
- nCur += (pszPos - pszFindWhere + 1);
+ nCur += (int) (pszPos - pszFindWhere + 1);
pszFindWhere = pszPos + 1;
continue;
}
- return nCur + (pszPos - pszFindWhere);
+ return nCur + (int) (pszPos - pszFindWhere);
}
}
ASSERT (FALSE); // Unreachable
@@ -4671,7 +4671,8 @@
int HowManyStr (LPCTSTR s, LPCTSTR m)
{
LPCTSTR p = s;
- int n = 0, l = _tcslen (m);
+ int n = 0;
+ const int l = (int) _tcslen (m);
while ((p = _tcsstr (p, m)) != NULL)
{
n++;
@@ -5457,9 +5458,9 @@
LPCTSTR pszOpenComment = m_CurSourceDef->opencomment,
pszCloseComment = m_CurSourceDef->closecomment,
pszCommentLine = m_CurSourceDef->commentline, pszTest;
- int nOpenComment = _tcslen (pszOpenComment),
- nCloseComment = _tcslen (pszCloseComment),
- nCommentLine = _tcslen (pszCommentLine);
+ int nOpenComment = (int) _tcslen (pszOpenComment),
+ nCloseComment = (int) _tcslen (pszCloseComment),
+ nCommentLine = (int) _tcslen (pszCommentLine);
if (nOther & 1)
{
for (;;)
@@ -5501,7 +5502,7 @@
{
if (!nCount--)
{
- ptCursorPos.x = pszEnd - pszText;
+ ptCursorPos.x = (LONG) (pszEnd - pszText);
if (bAfter)
ptCursorPos.x++;
SetCursorPos (ptCursorPos);
@@ -5568,7 +5569,7 @@
{
if (!nCount--)
{
- ptCursorPos.x = pszText - pszBegin;
+ ptCursorPos.x = (LONG) (pszText - pszBegin);
if (bAfter)
ptCursorPos.x++;
SetCursorPos (ptCursorPos);
Modified: trunk/Src/editlib/ccrystaltextview.h
===================================================================
--- trunk/Src/editlib/ccrystaltextview.h 2010-07-01 13:30:43 UTC (rev 7216)
+++ trunk/Src/editlib/ccrystaltextview.h 2010-07-01 14:54:51 UTC (rev 7217)
@@ -172,7 +172,7 @@
BOOL m_bPreparingToDrag;
BOOL m_bDraggingText;
BOOL m_bDragSelection, m_bWordSelection, m_bLineSelection;
- UINT m_nDragSelTimer;
+ UINT_PTR m_nDragSelTimer;
CPoint m_ptDrawSelStart, m_ptDrawSelEnd;
Modified: trunk/Src/editlib/ccrystaltextview2.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextview2.cpp 2010-07-01 13:30:43 UTC (rev 7216)
+++ trunk/Src/editlib/ccrystaltextview2.cpp 2010-07-01 14:54:51 UTC (rev 7217)
@@ -62,7 +62,7 @@
static char THIS_FILE[] = __FILE__;
#endif
-#define CRYSTAL_TIMER_DRAGSEL 1001
+static const UINT_PTR CRYSTAL_TIMER_DRAGSEL = 1001;
static LPTSTR NTAPI EnsureCharNext(LPCTSTR current)
{
@@ -170,21 +170,21 @@
LPCTSTR pszChars = GetLineChars (m_ptCursorPos.y);
int nPos = m_ptCursorPos.x;
int nPrevPos;
- while (nPos > 0 && xisspace (pszChars[nPrevPos = ::EnsureCharPrev(pszChars, pszChars + nPos) - pszChars]))
+ while (nPos > 0 && xisspace (pszChars[nPrevPos = (int) (::EnsureCharPrev(pszChars, pszChars + nPos) - pszChars)]))
nPos = nPrevPos;
if (nPos > 0)
{
- int nPrevPos = ::CharPrev(pszChars, pszChars + nPos) - pszChars;
+ int nPrevPos = (int) (::CharPrev(pszChars, pszChars + nPos) - pszChars);
nPos = nPrevPos;
if (xisalnum (pszChars[nPos]))
{
- while (nPos > 0 && (xisalnum (pszChars[nPrevPos = ::EnsureCharPrev(pszChars, pszChars + nPos) - pszChars])))
+ while (nPos > 0 && (xisalnum (pszChars[nPrevPos = (int) (::EnsureCharPrev(pszChars, pszChars + nPos) - pszChars)])))
nPos = nPrevPos;
}
else
{
- while (nPos > 0 && !xisalnum (pszChars[nPrevPos = ::EnsureCharPrev(pszChars, pszChars + nPos) - pszChars])
+ while (nPos > 0 && !xisalnum (pszChars[nPrevPos = (int) (::EnsureCharPrev(pszChars, pszChars + nPos) - pszChars)])
&& !xisspace (pszChars[nPrevPos]))
nPos = nPrevPos;
}
@@ -229,17 +229,17 @@
if (xisalnum (pszChars[nPos]))
{
while (nPos < nLength && xisalnum (pszChars[nPos]))
- nPos = ::EnsureCharNext(pszChars + nPos) - pszChars;
+ nPos = (int) (::EnsureCharNext(pszChars + nPos) - pszChars);
}
else
{
while (nPos < nLength && !xisalnum (pszChars[nPos])
&& !xisspace (pszChars[nPos]))
- nPos = ::EnsureCharNext(pszChars + nPos) - pszChars;
+ nPos = (int) (::EnsureCharNext(pszChars + nPos) - pszChars);
}
while (nPos < nLength && xisspace (pszChars[nPos]))
- nPos = ::EnsureCharNext(pszChars + nPos) - pszChars;
+ nPos = (int) (::EnsureCharNext(pszChars + nPos) - pszChars);
m_ptCursorPos.x = nPos;
m_nIdealCharPos = CalculateActualOffset (m_ptCursorPos.y, m_ptCursorPos.x);
@@ -532,7 +532,7 @@
{
if (!xisalnum (pszChars[pt.x]))
break;
- pt.x += ::CharNext (&pszChars[pt.x]) - &pszChars[pt.x];
+ pt.x += (int) (::CharNext (&pszChars[pt.x]) - &pszChars[pt.x]);
}
ASSERT_VALIDTEXTPOS (pt);
return pt;
@@ -546,7 +546,7 @@
int nPrevX = pt.x;
while (pt.x > 0)
{
- nPrevX -= &pszChars[pt.x] - ::CharPrev (pszChars, &pszChars[pt.x]);
+ nPrevX -= (int) (&pszChars[pt.x] - ::CharPrev (pszChars, &pszChars[pt.x]));
if (!xisalnum (pszChars[nPrevX]))
break;
pt.x = nPrevX;
@@ -1165,7 +1165,7 @@
LPTSTR pszData = (LPTSTR) GlobalLock (hData);
if (pszData != NULL)
{
- SIZE_T cbData = GlobalSize (hData);
+ UINT cbData = (UINT) GlobalSize (hData);
int cchText = cbData / sizeof(TCHAR) - 1;
if (cchText >= 0)
memcpy(text.GetBufferSetLength(cchText), pszData, cbData);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-07-01 13:30:53
|
Revision: 7216
http://winmerge.svn.sourceforge.net/winmerge/?rev=7216&view=rev
Author: kimmov
Date: 2010-07-01 13:30:43 +0000 (Thu, 01 Jul 2010)
Log Message:
-----------
Fixing 64-bit compile warnings.
Modified Paths:
--------------
trunk/Src/editlib/registry.cpp
Modified: trunk/Src/editlib/registry.cpp
===================================================================
--- trunk/Src/editlib/registry.cpp 2010-07-01 12:49:38 UTC (rev 7215)
+++ trunk/Src/editlib/registry.cpp 2010-07-01 13:30:43 UTC (rev 7216)
@@ -149,7 +149,7 @@
DWORD dwRealCount = 0, dwLength;
for (pszString = pValData->pszString; *pszString; pszString += dwLength)
{
- dwLength = _tcslen (pszString) + 1;
+ dwLength = (DWORD) _tcslen (pszString) + 1;
dwRealCount++;
}
if (dwCount >= dwRealCount)
@@ -157,7 +157,7 @@
LPTSTR *pszDstString = pszStrings;
for (LPCTSTR pszString = pValData->pszString; *pszString; pszString += dwLength, pszDstString++)
{
- dwLength = _tcslen (pszString) + 1;
+ dwLength = (DWORD) _tcslen (pszString) + 1;
LPTSTR pszNewString = (LPTSTR) malloc (dwLength);
*pszDstString = pszNewString;
if (pszNewString)
@@ -193,7 +193,7 @@
DWORD dwRealCount = 0, dwLength;
for (pszString = pValData->pszString; *pszString; pszString += dwLength)
{
- dwLength = _tcslen (pszString) + 1;
+ dwLength = (DWORD) _tcslen (pszString) + 1;
dwRealCount++;
}
LPTSTR *pszNewStrings = (LPTSTR *) malloc (dwRealCount *sizeof (LPTSTR));
@@ -203,7 +203,7 @@
*pdwCount = dwRealCount;
for (pszString = pValData->pszString; *pszString; pszString += dwLength, pszNewStrings++)
{
- dwLength = _tcslen (pszString) + 1;
+ dwLength = (DWORD) _tcslen (pszString) + 1;
LPTSTR pszNewString = (LPTSTR) malloc (dwLength);
*pszNewStrings = pszNewString;
if (pszNewString)
@@ -296,7 +296,7 @@
RegValSetString (RegVal *pValData, LPCTSTR pszString)
{
ASSERT (pValData &&pszString);
- DWORD dwLength = _tcslen (pszString) + 1;
+ DWORD dwLength = (DWORD) _tcslen (pszString) + 1;
pValData->pszString = (LPTSTR) malloc (dwLength);
if (pValData->pszString)
{
@@ -318,7 +318,7 @@
{
for (i = 0; i < dwCount; i++)
{
- dwSize += _tcslen (pszStrings[i]) + 1;
+ dwSize += (DWORD) _tcslen (pszStrings[i]) + 1;
}
}
else
@@ -360,7 +360,7 @@
RegValSetStringArr (RegVal *pValData, const CStringArray &arrString)
{
ASSERT (pValData);
- DWORD i, dwSize = 1, dwCount = arrString.GetSize ();
+ DWORD i, dwSize = 1, dwCount = (DWORD) arrString.GetSize ();
if (dwCount)
{
for (i = 0; i < dwCount; i++)
@@ -821,7 +821,7 @@
HKEY hSubKey = pszSubKey ? RegCreate (hKey, pszSubKey, KEY_WRITE) : hKey;
if (hSubKey)
{
- if (RegSetValueEx (hSubKey, pszValName, 0, REG_SZ, (LPBYTE) pszString, _tcslen (pszString) + 1) == ERROR_SUCCESS)
+ if (RegSetValueEx (hSubKey, pszValName, 0, REG_SZ, (LPBYTE) pszString, (DWORD)_tcslen (pszString) + 1) == ERROR_SUCCESS)
{
if (hSubKey != hKey)
RegClose (hSubKey);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-07-01 12:49:45
|
Revision: 7215
http://winmerge.svn.sourceforge.net/winmerge/?rev=7215&view=rev
Author: kimmov
Date: 2010-07-01 12:49:38 +0000 (Thu, 01 Jul 2010)
Log Message:
-----------
Fix 64-bit build warnings in BCMenu.
Modified Paths:
--------------
trunk/Src/BCMenu.cpp
trunk/Src/BCMenu.h
Modified: trunk/Src/BCMenu.cpp
===================================================================
--- trunk/Src/BCMenu.cpp 2010-07-01 10:59:36 UTC (rev 7214)
+++ trunk/Src/BCMenu.cpp 2010-07-01 12:49:38 UTC (rev 7215)
@@ -225,8 +225,8 @@
BOOL BCMenu::IsMenu(CMenu *submenu)
{
- int m;
- int numSubMenus = m_AllSubMenus.GetUpperBound();
+ INT_PTR m;
+ INT_PTR numSubMenus = m_AllSubMenus.GetUpperBound();
for(m=0;m<=numSubMenus;++m){
if(submenu->m_hMenu==m_AllSubMenus[m])return(TRUE);
}
@@ -235,8 +235,8 @@
BOOL BCMenu::IsMenu(HMENU submenu)
{
- int m;
- int numSubMenus = m_AllSubMenus.GetUpperBound();
+ INT_PTR m;
+ INT_PTR numSubMenus = m_AllSubMenus.GetUpperBound();
for(m=0;m<=numSubMenus;++m){
if(submenu==m_AllSubMenus[m])return(TRUE);
}
@@ -246,12 +246,12 @@
BOOL BCMenu::DestroyMenu()
{
// Destroy Sub menus:
- int m,n;
- int numAllSubMenus = m_AllSubMenus.GetUpperBound();
+ INT_PTR m,n;
+ INT_PTR numAllSubMenus = m_AllSubMenus.GetUpperBound();
for(n = numAllSubMenus; n>= 0; n--){
if(m_AllSubMenus[n]==this->m_hMenu)m_AllSubMenus.RemoveAt(n);
}
- int numSubMenus = m_SubMenus.GetUpperBound();
+ INT_PTR numSubMenus = m_SubMenus.GetUpperBound();
for(m = numSubMenus; m >= 0; m--){
numAllSubMenus = m_AllSubMenus.GetUpperBound();
for(n = numAllSubMenus; n>= 0; n--){
@@ -265,7 +265,7 @@
}
m_SubMenus.RemoveAll();
// Destroy menu data
- int numItems = m_MenuList.GetUpperBound();
+ INT_PTR numItems = m_MenuList.GetUpperBound();
for(m = 0; m <= numItems; m++)delete(m_MenuList[m]);
m_MenuList.RemoveAll();
if(checkmaps&&!checkmapsshare){
@@ -350,7 +350,8 @@
CBrush m_brSelect;
CPen m_penBack;
int x0,y0,dy;
- int nIconNormal=-1,xoffset=-1,global_offset=-1;
+ int nIconNormal=-1;
+ INT_PTR xoffset=-1,global_offset=-1;
CImageList *bitmap=NULL;
// set some colors
@@ -440,7 +441,7 @@
else if(disableflag){
if(!selectedflag){
CBitmap bitmapstandard;
- GetBitmapFromImageList(pDC,bitmap,xoffset,bitmapstandard);
+ GetBitmapFromImageList(pDC,bitmap,(int)xoffset,bitmapstandard);
rect2.SetRect(rect.left,rect.top+dy,rect.left+m_iconX+4,
rect.top+m_iconY+4+dy);
pDC->Draw3dRect (rect2,m_clrBack,m_clrBack);
@@ -471,7 +472,7 @@
GetSysColor(COLOR_3DSHADOW));
}
CPoint ptImage(rect.left+2,rect.top+2+dy);
- if(bitmap)bitmap->Draw(pDC,xoffset,ptImage,ILD_TRANSPARENT);
+ if(bitmap)bitmap->Draw(pDC,(int)xoffset,ptImage,ILD_TRANSPARENT);
}
else{
if(state&ODS_CHECKED){
@@ -494,7 +495,7 @@
pDC->Draw3dRect (rect2,m_clrBack,m_clrBack);
}
CPoint ptImage(rect.left+2,rect.top+2+dy);
- if(bitmap)bitmap->Draw(pDC,xoffset,ptImage,ILD_TRANSPARENT);
+ if(bitmap)bitmap->Draw(pDC,(int)xoffset,ptImage,ILD_TRANSPARENT);
}
}
if(nIconNormal<0 && state&ODS_CHECKED && !checkflag){
@@ -667,8 +668,9 @@
CBrush m_brSelect;
CPen m_penBack;
int x0,y0,dx,dy;
- int nIconNormal=-1,xoffset=-1,global_offset=-1;
- int faded_offset=1,shadow_offset=2,disabled_offset=3;
+ int nIconNormal=-1;
+ INT_PTR xoffset=-1,global_offset=-1;
+ INT_PTR faded_offset=1,shadow_offset=2,disabled_offset=3;
CImageList *bitmap=NULL;
BOOL CanDraw3D=FALSE;
@@ -699,7 +701,7 @@
xoffset=global_offset;
nIconNormal=0;
bitmap = &m_AllImages;
- if(xp_draw_3D_bitmaps&&CanDraw3DImageList(global_offset)){
+ if(xp_draw_3D_bitmaps&&CanDraw3DImageList((int)global_offset)){
CanDraw3D=TRUE;
faded_offset=global_offset+1;
shadow_offset=global_offset+2;
@@ -764,11 +766,11 @@
if(!selectedflag){
if(CanDraw3D){
CPoint ptImage(rect.left+dx,rect.top+dy);
- bitmap->Draw(pDC,disabled_offset,ptImage,ILD_TRANSPARENT);
+ bitmap->Draw(pDC,(int)disabled_offset,ptImage,ILD_TRANSPARENT);
}
else{
CBitmap bitmapstandard;
- GetBitmapFromImageList(pDC,bitmap,xoffset,bitmapstandard);
+ GetBitmapFromImageList(pDC,bitmap,(int)xoffset,bitmapstandard);
COLORREF transparentcol=m_newclrBack;
if(state&ODS_SELECTED)transparentcol=crSelectFill;
if(disable_old_style)
@@ -801,10 +803,10 @@
if(CanDraw3D&&!(state&ODS_CHECKED)){
CPoint ptImage1(ptImage.x+1,ptImage.y+1);
CPoint ptImage2(ptImage.x-1,ptImage.y-1);
- bitmap->Draw(pDC,shadow_offset,ptImage1,ILD_TRANSPARENT);
- bitmap->Draw(pDC,xoffset,ptImage2,ILD_TRANSPARENT);
+ bitmap->Draw(pDC,(int)shadow_offset,ptImage1,ILD_TRANSPARENT);
+ bitmap->Draw(pDC,(int)xoffset,ptImage2,ILD_TRANSPARENT);
}
- else bitmap->Draw(pDC,xoffset,ptImage,ILD_TRANSPARENT);
+ else bitmap->Draw(pDC,(int)xoffset,ptImage,ILD_TRANSPARENT);
}
}
else{
@@ -815,7 +817,7 @@
brushin.DeleteObject();
pDC->Draw3dRect(rect2,crSelect,crSelect);
CPoint ptImage(rect.left+dx-1,rect.top+dy-1);
- if(bitmap)bitmap->Draw(pDC,xoffset,ptImage,ILD_TRANSPARENT);
+ if(bitmap)bitmap->Draw(pDC,(int)xoffset,ptImage,ILD_TRANSPARENT);
}
else{
pDC->FillRect (rect2,&m_newbrBackground);
@@ -823,9 +825,9 @@
CPoint ptImage(rect.left+dx,rect.top+dy);
if(bitmap){
if(CanDraw3D)
- bitmap->Draw(pDC,faded_offset,ptImage,ILD_TRANSPARENT);
+ bitmap->Draw(pDC,(int)faded_offset,ptImage,ILD_TRANSPARENT);
else
- bitmap->Draw(pDC,xoffset,ptImage,ILD_TRANSPARENT);
+ bitmap->Draw(pDC,(int)xoffset,ptImage,ILD_TRANSPARENT);
}
}
}
@@ -1127,10 +1129,10 @@
int nIconNormal)
{
if(!(nFlags & MF_BYPOSITION)){
- int iPosition =0;
+ UINT iPosition =0;
BCMenu* pMenu = FindMenuOption(nPosition,iPosition);
if(pMenu){
- return(pMenu->InsertODMenuW(iPosition,lpstrText,nFlags|MF_BYPOSITION,nID,nIconNormal));
+ return(pMenu->InsertODMenuW((UINT)iPosition,lpstrText,nFlags|MF_BYPOSITION,nID,nIconNormal));
}
else return(FALSE);
}
@@ -1190,10 +1192,10 @@
CImageList *il,int xoffset)
{
if(!(nFlags & MF_BYPOSITION)){
- int iPosition =0;
+ UINT iPosition =0;
BCMenu* pMenu = FindMenuOption(nPosition,iPosition);
if(pMenu){
- return(pMenu->InsertODMenuW(iPosition,lpstrText,nFlags|MF_BYPOSITION,nID,il,xoffset));
+ return(pMenu->InsertODMenuW((UINT)iPosition,lpstrText,nFlags|MF_BYPOSITION,nID,il,xoffset));
}
else return(FALSE);
}
@@ -1236,10 +1238,10 @@
BOOL BCMenu::ModifyODMenuW(wchar_t *lpstrText,UINT nID,int nIconNormal)
{
- int nLoc;
+ UINT nLoc;
BCMenuData *mdata;
CArray<BCMenu*,BCMenu*>bcsubs;
- CArray<int,int&>bclocs;
+ CArray<UINT,UINT&>bclocs;
// Find the old BCMenuData structure:
BCMenu *psubmenu = FindMenuOption(nID,nLoc);
@@ -1289,10 +1291,10 @@
BOOL BCMenu::ModifyODMenuW(wchar_t *lpstrText,UINT nID,CImageList *il,int xoffset)
{
- int nLoc;
+ UINT nLoc;
BCMenuData *mdata;
CArray<BCMenu*,BCMenu*>bcsubs;
- CArray<int,int&>bclocs;
+ CArray<UINT,UINT&>bclocs;
// Find the old BCMenuData structure:
BCMenu *psubmenu = FindMenuOption(nID,nLoc);
@@ -1574,7 +1576,7 @@
}
}
if (!pData){
- int loc;
+ UINT loc;
BCMenu *pMenu = FindMenuOption(nID, loc);
ASSERT(pMenu != this);
if (loc >= 0){
@@ -1585,10 +1587,10 @@
}
-BCMenu *BCMenu::FindAnotherMenuOption(int nId,int& nLoc,CArray<BCMenu*,BCMenu*>&bcsubs,
- CArray<int,int&>&bclocs)
+BCMenu *BCMenu::FindAnotherMenuOption(int nId,UINT& nLoc,CArray<BCMenu*,BCMenu*>&bcsubs,
+ CArray<UINT,UINT&>&bclocs)
{
- int i,numsubs,j;
+ UINT i,numsubs,j;
BCMenu *psubmenu,*pgoodmenu;
BOOL foundflag;
@@ -1596,14 +1598,14 @@
#ifdef _CPPRTTI
psubmenu=dynamic_cast<BCMenu *>(GetSubMenu(i));
#else
- psubmenu=(BCMenu *)GetSubMenu(i);
+ psubmenu=(BCMenu *)GetSubMenu((int)i);
#endif
if(psubmenu){
pgoodmenu=psubmenu->FindAnotherMenuOption(nId,nLoc,bcsubs,bclocs);
if(pgoodmenu)return(pgoodmenu);
}
- else if(nId==(int)GetMenuItemID(i)){
- numsubs=bcsubs.GetSize();
+ else if(nId==(int)GetMenuItemID((int)i)){
+ numsubs=(UINT)bcsubs.GetSize();
foundflag=TRUE;
for(j=0;j<numsubs;++j){
if(bcsubs[j]==this&&bclocs[j]==i){
@@ -1621,12 +1623,12 @@
return(NULL);
}
-BCMenu *BCMenu::FindMenuOption(int nId,int& nLoc)
+BCMenu *BCMenu::FindMenuOption(int nId,UINT& nLoc)
{
- int i;
+ UINT i;
BCMenu *psubmenu,*pgoodmenu;
- for(i=0;i<(int)(GetMenuItemCount());++i){
+ for(i=0;i<GetMenuItemCount();++i){
#ifdef _CPPRTTI
psubmenu=dynamic_cast<BCMenu *>(GetSubMenu(i));
#else
@@ -1714,7 +1716,7 @@
// Variables needed during processing of Menu Item Templates:
- int j=0;
+ INT_PTR j=0;
WORD dwFlags = 0; // Flags of the Menu Item
WORD dwID = 0; // ID of the Menu Item
UINT uFlags; // Actual Flags.
@@ -1804,8 +1806,8 @@
CString name,str;
int menuloc=-1,listloc=-1,menustart=0,i=0,j=0;
- int nummenulist=m_MenuList.GetSize();
- int nummenu=(int)GetMenuItemCount();
+ INT_PTR nummenulist=m_MenuList.GetSize();
+ UINT nummenu=(int)GetMenuItemCount();
while(i<nummenu&&menuloc==-1){
GetMenuString (i, name, MF_BYPOSITION);
@@ -1829,7 +1831,8 @@
{
CString str;
int i=0,j=0;
- int nummenulist=m_MenuList.GetSize(),menustart;
+ INT_PTR nummenulist=m_MenuList.GetSize();
+ int menustart;
menustart=GetMenuStart();
for(i=menustart,j=0;i<(int)GetMenuItemCount();++i,++j){
@@ -1880,7 +1883,7 @@
else newstring=string;
newstring+=_T(" ");//SK: modified for Unicode correctness.
LPCTSTR lpstrText = (LPCTSTR)newstring;
- t=pDC->GetTextExtent(lpstrText,_tcslen(lpstrText));
+ t=pDC->GetTextExtent(lpstrText,(int)_tcslen(lpstrText));
if(t.cx>maxlength)maxlength = t.cx;
}
for(i=0;i<numitems;++i){
@@ -1890,11 +1893,11 @@
newstring.Empty();
newstring=string.Left(j);
LPCTSTR lpstrText = (LPCTSTR)(newstring);
- t=pDC->GetTextExtent(lpstrText,_tcslen(lpstrText));
+ t=pDC->GetTextExtent(lpstrText,(int)_tcslen(lpstrText));
while(t.cx<maxlength){
newstring+=_T(' ');//SK: modified for Unicode correctness
LPCTSTR lpstrText = (LPCTSTR)(newstring);
- t=pDC->GetTextExtent(lpstrText,_tcslen(lpstrText));
+ t=pDC->GetTextExtent(lpstrText,(int)_tcslen(lpstrText));
}
newstring+=string.Mid(j);
#ifdef UNICODE
@@ -1934,14 +1937,14 @@
BOOL returnflag=FALSE;
if(MF_BYPOSITION&nFlags){
- UINT numMenuItems = m_MenuList.GetUpperBound();
+ INT_PTR numMenuItems = m_MenuList.GetUpperBound();
if(id<=numMenuItems){
string=m_MenuList[id]->GetString();
returnflag=TRUE;
}
}
else{
- int uiLoc;
+ UINT uiLoc;
BCMenu* pMenu = FindMenuOption(id,uiLoc);
if(NULL!=pMenu) returnflag = pMenu->GetMenuText(uiLoc,string);
}
@@ -2433,7 +2436,7 @@
pToolBar->GetButtonInfo(i, nID, nStyle, nImage);
// OK, we have the command ID of the toolbar
// option, and the tollbar bitmap offset
- int nLoc;
+ UINT nLoc;
BCMenuData* pData;
BCMenu *pSubMenu = FindMenuOption(nID, nLoc);
if (pSubMenu && nLoc >= 0)pData = pSubMenu->m_MenuList[nLoc];
@@ -2657,20 +2660,20 @@
}
}
else{
- int numSubMenus = m_SubMenus.GetUpperBound();
- for(int m = numSubMenus; m >= 0; m--){
+ INT_PTR numSubMenus = m_SubMenus.GetUpperBound();
+ for(INT_PTR m = numSubMenus; m >= 0; m--){
if(m_SubMenus[m]==pSubMenu->m_hMenu){
- int numAllSubMenus = m_AllSubMenus.GetUpperBound();
- for(int n = numAllSubMenus; n>= 0; n--){
+ INT_PTR numAllSubMenus = m_AllSubMenus.GetUpperBound();
+ for(INT_PTR n = numAllSubMenus; n>= 0; n--){
if(m_AllSubMenus[n]==m_SubMenus[m])m_AllSubMenus.RemoveAt(n);
}
m_SubMenus.RemoveAt(m);
}
}
- int num = pSubMenu->GetMenuItemCount();
- int i=0;
+ UINT num = pSubMenu->GetMenuItemCount();
+ UINT i=0;
for(i=num-1;i>=0;--i)pSubMenu->RemoveMenu(i,MF_BYPOSITION);
- for(i=m_MenuList.GetUpperBound();i>=0;i--){
+ for(i=(UINT)m_MenuList.GetUpperBound();i>=0;i--){
if(m_MenuList[i]->nID==(UINT)pSubMenu->m_hMenu){
delete m_MenuList.GetAt(i);
m_MenuList.RemoveAt(i);
@@ -2682,7 +2685,7 @@
}
}
else{
- int iPosition =0;
+ UINT iPosition =0;
BCMenu* pMenu = FindMenuOption(uiId,iPosition);
// bug fix RIA 14th September 2000
// failed to return correct value on call to remove menu as the item was
@@ -2699,7 +2702,7 @@
UINT uint = GetMenuState(uiId,MF_BYPOSITION);
if(uint&MF_SEPARATOR && !(uint&MF_POPUP)){
// make sure it's a separator
- int menulistsize=m_MenuList.GetSize();
+ INT_PTR menulistsize=m_MenuList.GetSize();
if(uiId<(UINT)menulistsize){
CString str=m_MenuList[uiId]->GetString();
if(str==""){
@@ -2721,20 +2724,20 @@
}
}
else{
- int numSubMenus = m_SubMenus.GetUpperBound();
- for(int m = numSubMenus; m >= 0; m--){
+ INT_PTR numSubMenus = m_SubMenus.GetUpperBound();
+ for(INT_PTR m = numSubMenus; m >= 0; m--){
if(m_SubMenus[m]==pSubMenu->m_hMenu){
- int numAllSubMenus = m_AllSubMenus.GetUpperBound();
- for(int n = numAllSubMenus; n>= 0; n--){
+ INT_PTR numAllSubMenus = m_AllSubMenus.GetUpperBound();
+ for(INT_PTR n = numAllSubMenus; n>= 0; n--){
if(m_AllSubMenus[n]==m_SubMenus[m])m_AllSubMenus.RemoveAt(n);
}
m_SubMenus.RemoveAt(m);
}
}
- int num = pSubMenu->GetMenuItemCount();
- int i=0;
+ UINT num = pSubMenu->GetMenuItemCount();
+ UINT i=0;
for(i=num-1;i>=0;--i)pSubMenu->DeleteMenu(i,MF_BYPOSITION);
- for(i=m_MenuList.GetUpperBound();i>=0;i--){
+ for(i=(UINT)m_MenuList.GetUpperBound();i>=0;i--){
if(m_MenuList[i]->nID==(UINT)pSubMenu->m_hMenu){
delete m_MenuList.GetAt(i);
m_MenuList.RemoveAt(i);
@@ -2746,7 +2749,7 @@
}
}
else{
- int iPosition =0;
+ UINT iPosition =0;
BCMenu* pMenu = FindMenuOption(uiId,iPosition);
if(pMenu)return pMenu->DeleteMenu(iPosition,MF_BYPOSITION);
}
@@ -3036,7 +3039,7 @@
if(MF_BYPOSITION&nFlags)
{
- UINT numMenuItems = m_MenuList.GetUpperBound();
+ INT_PTR numMenuItems = m_MenuList.GetUpperBound();
if(id<=numMenuItems){
#ifdef UNICODE
m_MenuList[id]->SetWideString((LPCTSTR)string);
@@ -3047,7 +3050,7 @@
}
}
else{
- int uiLoc;
+ UINT uiLoc;
BCMenu* pMenu = FindMenuOption(id,uiLoc);
if(NULL!=pMenu) returnflag = pMenu->SetMenuText(uiLoc,string);
}
@@ -3131,7 +3134,7 @@
int BCMenu::GlobalImageListOffset(int nID)
{
- int numcurrent=m_AllImagesID.GetSize();
+ INT_PTR numcurrent=m_AllImagesID.GetSize();
int existsloc = -1;
for(int i=0;i<numcurrent;++i){
if(m_AllImagesID[i]==nID){
@@ -3145,7 +3148,7 @@
BOOL BCMenu::CanDraw3DImageList(int offset)
{
BOOL retflag=FALSE;
- int numcurrent=m_AllImagesID.GetSize();
+ INT_PTR numcurrent=m_AllImagesID.GetSize();
if(offset+1<numcurrent&&offset+2<numcurrent){
int nID=m_AllImagesID[offset];
if(m_AllImagesID[offset+1]==nID&&m_AllImagesID[offset+2]==nID)retflag=TRUE;
@@ -3153,9 +3156,9 @@
return(retflag);
}
-int BCMenu::AddToGlobalImageList(CImageList *il,int xoffset,int nID)
+INT_PTR BCMenu::AddToGlobalImageList(CImageList *il,int xoffset,int nID)
{
- int loc = -1;
+ INT_PTR loc = -1;
HIMAGELIST hImageList = m_AllImages.m_hImageList;
if(!hImageList){
m_AllImages.Create(m_iconX,m_iconY,ILC_COLORDDB|ILC_MASK,1,1);
@@ -3175,9 +3178,9 @@
GetDisabledBitmap(bmp3);
pWnd->ReleaseDC(pDC); // Release the DC
}
- int numcurrent=m_AllImagesID.GetSize();
- int existsloc = -1;
- for(int i=0;i<numcurrent;++i){
+ UINT numcurrent=(UINT)m_AllImagesID.GetSize();
+ UINT existsloc = -1;
+ for(UINT i=0;i<numcurrent;++i){
if(m_AllImagesID[i]==nID){
existsloc=i;
break;
@@ -3222,7 +3225,7 @@
}
::DestroyIcon(hIcon);
}
- return(loc);
+ return loc;
}
bool BCMenu::AppendMenu (BCMenu* pMenuToAdd, bool add_separator /*= true*/, int num_items_to_remove_at_end /*= 0*/)
Modified: trunk/Src/BCMenu.h
===================================================================
--- trunk/Src/BCMenu.h 2010-07-01 10:59:36 UTC (rev 7214)
+++ trunk/Src/BCMenu.h 2010-07-01 12:49:38 UTC (rev 7215)
@@ -40,7 +40,7 @@
const wchar_t *GetWideString(void) {return m_szMenuText;};
~BCMenuData ();
CString GetString(void);//returns the menu text in ANSI or UNICODE
- int xoffset,global_offset;
+ INT_PTR xoffset,global_offset;
int menuIconNormal;
UINT nFlags,nID,syncflag;
CImageList *bitmap;
@@ -236,9 +236,9 @@
static BOOL IsLunaMenuStyle(void);
static BOOL IsWindowsClassicTheme(void);
BCMenuData *BCMenu::FindMenuItem(UINT nID);
- BCMenu *FindMenuOption(int nId,int& nLoc);
- BCMenu *FindAnotherMenuOption(int nId,int& nLoc,CArray<BCMenu*,BCMenu*>&bcsubs,
- CArray<int,int&>&bclocs);
+ BCMenu *FindMenuOption(int nId,UINT& nLoc);
+ BCMenu *FindAnotherMenuOption(int nId,UINT& nLoc,CArray<BCMenu*,BCMenu*>&bcsubs,
+ CArray<UINT,UINT&>&bclocs);
BCMenuData *FindMenuOption(wchar_t *lpstrText);
void InsertSpaces(void);
void DrawCheckMark(CDC* pDC,int x,int y,COLORREF color,BOOL narrowflag=FALSE);
@@ -268,7 +268,7 @@
void GetTransparentBitmap(CBitmap &bmp);
void GetDisabledBitmap(CBitmap &bmp,COLORREF background=0);
void GetShadowBitmap(CBitmap &bmp);
- int AddToGlobalImageList(CImageList *il,int xoffset,int nID);
+ INT_PTR AddToGlobalImageList(CImageList *il,int xoffset,int nID);
int GlobalImageListOffset(int nID);
BOOL CanDraw3DImageList(int offset);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-07-01 10:59:43
|
Revision: 7214
http://winmerge.svn.sourceforge.net/winmerge/?rev=7214&view=rev
Author: kimmov
Date: 2010-07-01 10:59:36 +0000 (Thu, 01 Jul 2010)
Log Message:
-----------
Fix some 64-bit build warnings.
Modified Paths:
--------------
trunk/Src/Common/unicoder.cpp
trunk/Src/Common/unicoder.h
trunk/Src/ConfigLog.cpp
trunk/Src/FileFilterMgr.cpp
trunk/Src/FileFilterMgr.h
trunk/Src/FileFiltersDlg.cpp
trunk/Src/FilterList.cpp
trunk/Src/WaitStatusCursor.h
Modified: trunk/Src/Common/unicoder.cpp
===================================================================
--- trunk/Src/Common/unicoder.cpp 2010-07-01 09:25:10 UTC (rev 7213)
+++ trunk/Src/Common/unicoder.cpp 2010-07-01 10:59:36 UTC (rev 7214)
@@ -739,7 +739,7 @@
* FF FE 00 00 UTF-32, little endian
* 00 00 FE FF UTF-32, big-endian
*/
-UNICODESET DetermineEncoding(PBYTE pBuffer, __int64 size, bool * pBom)
+UNICODESET DetermineEncoding(PBYTE pBuffer, INT64 size, bool * pBom)
{
UNICODESET unicoding = ucr::NONE;
*pBom = false;
@@ -784,7 +784,8 @@
// If not any of the above, check if it is UTF-8 without BOM?
if (unicoding == ucr::NONE)
{
- int bufSize = min(size, 8 * 1024);
+ const INT64 maxSize = 8 * 1024;
+ int bufSize = (int) min(size, maxSize);
bool invalidUtf8 = CheckForInvalidUtf8(pBuffer, bufSize);
if (!invalidUtf8)
{
Modified: trunk/Src/Common/unicoder.h
===================================================================
--- trunk/Src/Common/unicoder.h 2010-07-01 09:25:10 UTC (rev 7213)
+++ trunk/Src/Common/unicoder.h 2010-07-01 10:59:36 UTC (rev 7214)
@@ -67,7 +67,7 @@
String CrossConvertToStringA(const char* src, unsigned int srclen, int cpin, int cpout, bool * lossy);
#endif
-UNICODESET DetermineEncoding(PBYTE pBuffer, __int64 size, bool * pBom);
+UNICODESET DetermineEncoding(PBYTE pBuffer, INT64 size, bool * pBom);
} // namespace ucr
Modified: trunk/Src/ConfigLog.cpp
===================================================================
--- trunk/Src/ConfigLog.cpp 2010-07-01 09:25:10 UTC (rev 7213)
+++ trunk/Src/ConfigLog.cpp 2010-07-01 10:59:36 UTC (rev 7214)
@@ -936,7 +936,7 @@
bool lossy;
while (file.ReadString(strline, &lossy))
{
- int colon = strline.find(_T(":"));
+ String::size_type colon = strline.find(_T(":"));
if (colon > 0)
{
String name = strline.substr(0, colon);
Modified: trunk/Src/FileFilterMgr.cpp
===================================================================
--- trunk/Src/FileFilterMgr.cpp 2010-07-01 09:25:10 UTC (rev 7213)
+++ trunk/Src/FileFilterMgr.cpp 2010-07-01 10:59:36 UTC (rev 7214)
@@ -67,7 +67,7 @@
*/
void FileFilterMgr::LoadFromDirectory(LPCTSTR dir, LPCTSTR szPattern, LPCTSTR szExt)
{
- const int extlen = szExt ? _tcslen(szExt) : 0;
+ const int extlen = szExt ? (int)_tcslen(szExt) : 0;
const String pattern = paths_ConcatPath(dir, szPattern);
WIN32_FIND_DATA ff;
HANDLE h = FindFirstFile(pattern.c_str(), &ff);
@@ -166,7 +166,7 @@
// For unicode builds, use UTF-8.
// Convert pattern to UTF-8 and set option for PCRE to specify UTF-8.
regexLen = TransformUcs2ToUtf8(str.c_str(), str.length(),
- regexString, sizeof(regexString));
+ regexString, (int)sizeof(regexString));
pcre_opts |= PCRE_UTF8;
#else
strcpy(regexString, str.c_str());
@@ -301,7 +301,6 @@
vector<FileFilterElement*>::const_iterator iter = filterList->begin();
while (iter != filterList->end())
{
- //const FileFilterElement & elem = filterList.GetNext(pos);
int ovector[30];
char compString[200] = {0};
int stringLen = 0;
Modified: trunk/Src/FileFilterMgr.h
===================================================================
--- trunk/Src/FileFilterMgr.h 2010-07-01 09:25:10 UTC (rev 7213)
+++ trunk/Src/FileFilterMgr.h 2010-07-01 10:59:36 UTC (rev 7214)
@@ -69,7 +69,7 @@
void RemoveFilter(LPCTSTR szFilterFile);
// access to array of filters
- int GetFilterCount() const { return m_filters.size(); }
+ int GetFilterCount() const { return (int) m_filters.size(); }
String GetFilterName(int i) const;
String GetFilterName(const FileFilter *pFilter) const;
String GetFilterPath(int i) const;
Modified: trunk/Src/FileFiltersDlg.cpp
===================================================================
--- trunk/Src/FileFiltersDlg.cpp 2010-07-01 09:25:10 UTC (rev 7213)
+++ trunk/Src/FileFiltersDlg.cpp 2010-07-01 10:59:36 UTC (rev 7214)
@@ -142,7 +142,7 @@
m_listFilters.SetItemText(0, 1, title.c_str());
m_listFilters.SetItemText(0, 2, title.c_str());
- const int count = m_Filters->size();
+ const int count = (int) m_Filters->size();
for (int i = 0; i < count; i++)
{
@@ -524,7 +524,7 @@
*/
void FileFiltersDlg::UpdateFiltersList()
{
- int count = m_Filters->size();
+ int count = (int) m_Filters->size();
m_listFilters.DeleteAllItems();
Modified: trunk/Src/FilterList.cpp
===================================================================
--- trunk/Src/FilterList.cpp 2010-07-01 09:25:10 UTC (rev 7213)
+++ trunk/Src/FilterList.cpp 2010-07-01 10:59:36 UTC (rev 7214)
@@ -130,7 +130,7 @@
result = pcre_exec(regexp, extra, (const char *)buf.ptr, buf.size,
0, 0, ovector, 30);
else
- result = pcre_exec(regexp, extra, string, stringlen,
+ result = pcre_exec(regexp, extra, string, (int)stringlen,
0, 0, ovector, 30);
if (result >= 0)
{
Modified: trunk/Src/WaitStatusCursor.h
===================================================================
--- trunk/Src/WaitStatusCursor.h 2010-07-01 09:25:10 UTC (rev 7213)
+++ trunk/Src/WaitStatusCursor.h 2010-07-01 10:59:36 UTC (rev 7214)
@@ -43,7 +43,7 @@
void Create(HINSTANCE hinst, LPCTSTR lpCursorName, LPCTSTR m_msg);
private:
- int posInStack;
+ INT_PTR posInStack;
bool m_ended;
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-07-01 09:25:17
|
Revision: 7213
http://winmerge.svn.sourceforge.net/winmerge/?rev=7213&view=rev
Author: kimmov
Date: 2010-07-01 09:25:10 +0000 (Thu, 01 Jul 2010)
Log Message:
-----------
Win64: Put temp build files to BuildTmp folder as 32-bit builds do.
Modified Paths:
--------------
trunk/Src/MergeX64.vcproj
Modified: trunk/Src/MergeX64.vcproj
===================================================================
--- trunk/Src/MergeX64.vcproj 2010-07-01 08:36:46 UTC (rev 7212)
+++ trunk/Src/MergeX64.vcproj 2010-07-01 09:25:10 UTC (rev 7213)
@@ -887,8 +887,8 @@
</Configuration>
<Configuration
Name="X64 Debug|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ OutputDirectory=".\..\BuildTmp\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory=".\..\BuildTmp\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="2"
@@ -1082,8 +1082,8 @@
</Configuration>
<Configuration
Name="X64 Release|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ OutputDirectory=".\..\BuildTmp\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory=".\..\BuildTmp\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="2"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-07-01 08:36:52
|
Revision: 7212
http://winmerge.svn.sourceforge.net/winmerge/?rev=7212&view=rev
Author: kimmov
Date: 2010-07-01 08:36:46 +0000 (Thu, 01 Jul 2010)
Log Message:
-----------
Update SCEW to 1.1.2
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Externals/scew/NEWS
trunk/Externals/scew/THANKS
trunk/Externals/scew/configure.ac
trunk/Externals/scew/doc/Doxyfile.in
trunk/Externals/scew/etc/autoconf/doxygen.m4
trunk/Externals/scew/examples/scew_print/scew_print.c
trunk/Externals/scew/examples/scew_stream/scew_stream.c
trunk/Externals/scew/examples/scew_write/scew_write.c
trunk/Externals/scew/scew/attribute.c
trunk/Externals/scew/scew/element.c
trunk/Externals/scew/scew/error.c
trunk/Externals/scew/scew/parser.c
trunk/Externals/scew/scew/str.c
trunk/Externals/scew/scew/str.h
trunk/Externals/scew/scew/tree.c
trunk/Externals/scew/scew/xerror.c
trunk/Externals/scew/scew/xparser.c
trunk/Externals/versions.txt
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-06-30 05:34:17 UTC (rev 7211)
+++ trunk/Docs/Users/ChangeLog.txt 2010-07-01 08:36:46 UTC (rev 7212)
@@ -5,6 +5,7 @@
WinMerge 2.13.14
Update to PCRE 8.10 (r7210)
+ Update SCEW to 1.1.2 (r7212)
WinMerge 2.13.13 - 2010-06-19 (r7205)
Improve editing of linefilter regular expressions (#3015416)
Modified: trunk/Externals/scew/NEWS
===================================================================
--- trunk/Externals/scew/NEWS 2010-06-30 05:34:17 UTC (rev 7211)
+++ trunk/Externals/scew/NEWS 2010-07-01 08:36:46 UTC (rev 7212)
@@ -1,11 +1,21 @@
SCEW -- History of visible changes.
-Copyright (C) 2002-2009 Aleix Conchillo Flaqu\xE9
+Copyright (C) 2002-2010 Aleix Conchillo Flaqu\xE9
See the end for copying conditions.
------------------------------------------------------------------------
+* Version 1.1.2 (2010/06/04)
+
+** Fixes:
+
+ - Precondition violation when assigning preamble to tree after
+ trimming and becoming NULL (scew/xparser.c).
+ (reported by Rudolf Alexander Kerbitz)
+
+------------------------------------------------------------------------
+
* Version 1.1.1 (2009/12/11)
** Changes:
@@ -135,25 +145,25 @@
** Changes:
- - Ability to load and XML document from an stream has been
- added. The stream may not be completed, so it will just load
+ - Ability to load and XML document from an stream has been
+ added. The stream may not be completed, so it will just load
correct XML pieces. A callback, set by the user, will be called
each time an element is available.
- (thanks to Gord Shier)
+ (thanks to Gord Shier)
** Fixes:
- - Fixed indentation level when document contains multiple
- consecutive empty elements.
- (thanks to Tom Probasco)
+ - Fixed indentation level when document contains multiple
+ consecutive empty elements.
+ (thanks to Tom Probasco)
- - scew_element_add_attr_pair() did not add a new attribute
- correctly if the attribute already existed.
- (reported by Matthew Peltzer)
+ - scew_element_add_attr_pair() did not add a new attribute
+ correctly if the attribute already existed.
+ (reported by Matthew Peltzer)
- - Compiltaion fixes in MSVC. Compiler interpreted a function
- argument called list as the std::list.
- (reported by Renaud Dumont)
+ - Compiltaion fixes in MSVC. Compiler interpreted a function
+ argument called list as the std::list.
+ (reported by Renaud Dumont)
------------------------------------------------------------------------
@@ -161,23 +171,23 @@
** Changes:
- - A new "Unknown error code" message has been added.
- (thanks to Brodie Thiesfield)
+ - A new "Unknown error code" message has been added.
+ (thanks to Brodie Thiesfield)
- - Improved support for Windows and Unix compilation.
- (thanks to Brodie Thiesfield)
+ - Improved support for Windows and Unix compilation.
+ (thanks to Brodie Thiesfield)
- - Added improvements in str functions. mem.* has been removed.
- (thanks to Brodie Thiesfield)
+ - Added improvements in str functions. mem.* has been removed.
+ (thanks to Brodie Thiesfield)
- Write functions have been moved from tree to new writer.* files.
- - Added a preamble section to the XML declaration.
+ - Added a preamble section to the XML declaration.
** Fixes:
- - Allow building in a separate directory.
- (thanks to Kalle Valo)
+ - Allow building in a separate directory.
+ (thanks to Kalle Valo)
------------------------------------------------------------------------
@@ -187,40 +197,40 @@
- Added missing performace improvements by using the linked list in
element and attribute iterations.
- (thanks to Brodie Thiesfield)
+ (thanks to Brodie Thiesfield)
- - Added exponentially growing buffer to avoid many realloc calls
- which are slow and fragment memory in scew_element_list.
- (thanks to Brodie Thiesfield)
+ - Added exponentially growing buffer to avoid many realloc calls
+ which are slow and fragment memory in scew_element_list.
+ (thanks to Brodie Thiesfield)
- - Performance improvements in file loading by using a static
- buffer.
- (thanks to Brodie Thiesfield)
+ - Performance improvements in file loading by using a static
+ buffer.
+ (thanks to Brodie Thiesfield)
- - Added scew_parser_load_file_fp().
- (thanks to Brodie Thiesfield)
+ - Added scew_parser_load_file_fp().
+ (thanks to Brodie Thiesfield)
- - Some other minor changes.
- (thanks to Brodie Thiesfield)
+ - Some other minor changes.
+ (thanks to Brodie Thiesfield)
** Fixes:
- - scew_isxdigit() was calling isdigit() instead of isxdigit().
+ - scew_isxdigit() was calling isdigit() instead of isxdigit().
- - scew_isxxxx() fixed.
- (thanks to Brodie Thiesfield)
+ - scew_isxxxx() fixed.
+ (thanks to Brodie Thiesfield)
- - strdup() is a GNU extension, replaced it by own version.
+ - strdup() is a GNU extension, replaced it by own version.
- - Fixed scew_element_by_name.
- (reported by Eric Fronheiser)
+ - Fixed scew_element_by_name.
+ (reported by Eric Fronheiser)
- - Warning fixes (level 4) in Microsoft Visual C++ 7.
- (thanks to Brodie Thiesfield)
+ - Warning fixes (level 4) in Microsoft Visual C++ 7.
+ (thanks to Brodie Thiesfield)
- - Multi-thread support fixed in Microsoft Visual
+ - Multi-thread support fixed in Microsoft Visual
C++. __declspec(thread) did not work, use TLS functions instead.
- (thanks to Brodie Thiesfield)
+ (thanks to Brodie Thiesfield)
------------------------------------------------------------------------
@@ -231,34 +241,34 @@
- Added more string functions. New memory functions have also been
added.
- - Performance improved in element and attribute iteration.
- (thanks to Sanzo Miyazawa)
+ - Performance improved in element and attribute iteration.
+ (thanks to Sanzo Miyazawa)
- Support for XML declaration attributes has been added (version,
encoding, standalone). This attributes can be changed using SCEW
tree functions.
- - Improved white spaces treatment in XML element contents.
+ - Improved white spaces treatment in XML element contents.
- - Added error system. See documentation for more details.
+ - Added error system. See documentation for more details.
- - Added pkg-config file.
- (thanks to Neil Harvey)
+ - Added pkg-config file.
+ (thanks to Neil Harvey)
- - Added 'make doc'. If you have doxygen installed (which will be
+ - Added 'make doc'. If you have doxygen installed (which will be
automatically detected), it will create SCEW
documentation. Execute './configure --help' to see more
documentation options.
- - 'make install' does not install example binaries anymore.
+ - 'make install' does not install example binaries anymore.
** Fixes:
- - scew_tree_save_file() did not fclose output file.
- (reported by Paul Bohme)
+ - scew_tree_save_file() did not fclose output file.
+ (reported by Paul Bohme)
- scew_element_free() did not decrement parent number of children.
- (reported by anonymous)
+ (reported by anonymous)
------------------------------------------------------------------------
@@ -266,16 +276,16 @@
** Changes:
- - Added --enable-debug flag to the configure script.
+ - Added --enable-debug flag to the configure script.
** Fixes:
- - Added compatibilized headers with C++ (ifdef __cplusplus).
+ - Added compatibilized headers with C++ (ifdef __cplusplus).
- - Compilation warnings fixed.
+ - Compilation warnings fixed.
- - scew_element_del_attr() segmentation fault fixed.
- (reported by Jussi M\xE4ki)
+ - scew_element_del_attr() segmentation fault fixed.
+ (reported by Jussi M\xE4ki)
------------------------------------------------------------------------
@@ -283,7 +293,7 @@
** Changes:
- - Functions to create and save XML files have been added.
+ - Functions to create and save XML files have been added.
- A lot of cleanup and rewriting has been done. Internal structures
have changed.
@@ -300,7 +310,7 @@
- scew_get_element_by_name() and scew_get_attribute_by_name() did
not return NULL if an element/attribute was not found.
- (reported by Stuart R. Anderson)
+ (reported by Stuart R. Anderson)
------------------------------------------------------------------------
@@ -312,7 +322,7 @@
* Copying information:
-Copyright (C) 2002-2009 Aleix Conchillo Flaqu\xE9
+Copyright (C) 2002-2010 Aleix Conchillo Flaqu\xE9
Permission is granted to anyone to make or distribute verbatim
copies of this document as received, in any medium, provided that
Modified: trunk/Externals/scew/THANKS
===================================================================
--- trunk/Externals/scew/THANKS 2010-06-30 05:34:17 UTC (rev 7211)
+++ trunk/Externals/scew/THANKS 2010-07-01 08:36:46 UTC (rev 7212)
@@ -6,7 +6,7 @@
improvements, or submitting actual code. Here is a list of these
people. Help me keep it complete and exempt of errors.
-* Jose A. Ortega suggested some important C implementation details. As
+* Jose A. Ortega suggested some important C implementation details. As
usual, he has helped me in many other ways. Thanks jao!
* Brodie Thiesfield has submitted lots of fixes and improvements. He
@@ -28,6 +28,7 @@
* Bug reporting and others (in alphabetical order):
Anonymous reporters, Stuart R. Anderson, Paul Bohme, Eric
- Fronheiser, Alex Katebi, Aaron S. Kurland, Christopher Layne, Jussi
- M\xE4ki, Sanzo Miyazawa, George Neill, Gord Shier, Brodie Thiesfield,
- Andrew Thomas, Kalle Vallo, Michal Wozniak and Mark Zieg.
+ Fronheiser, Alex Katebi, Rudolf Alexander Kerbitz, Aaron S. Kurland,
+ Christopher Layne, Jussi M\xE4ki, Sanzo Miyazawa, George Neill, Gord
+ Shier, Brodie Thiesfield, Andrew Thomas, Kalle Vallo, Michal Wozniak
+ and Mark Zieg.
Modified: trunk/Externals/scew/configure.ac
===================================================================
--- trunk/Externals/scew/configure.ac 2010-06-30 05:34:17 UTC (rev 7211)
+++ trunk/Externals/scew/configure.ac 2010-07-01 08:36:46 UTC (rev 7212)
@@ -2,12 +2,12 @@
# Author: Aleix Conchillo Flaque <al...@me...>
# Date: Mon Oct 07, 2002 01:56
#
-# Copyright (C) 2002-2009 Aleix Conchillo Flaque
+# Copyright (C) 2002-2010 Aleix Conchillo Flaque
#
#### boilerplate and flags
-define([scew_version], [1.1.1])
+define([scew_version], [1.1.2])
AC_INIT(scew/scew.h, scew_version)
AM_INIT_AUTOMAKE(scew, scew_version)
Modified: trunk/Externals/scew/doc/Doxyfile.in
===================================================================
--- trunk/Externals/scew/doc/Doxyfile.in 2010-06-30 05:34:17 UTC (rev 7211)
+++ trunk/Externals/scew/doc/Doxyfile.in 2010-07-01 08:36:46 UTC (rev 7212)
@@ -749,13 +749,13 @@
# contain links (just like the HTML output) instead of page references
# This makes the output suitable for online browsing using a pdf viewer.
-PDF_HYPERLINKS = NO
+PDF_HYPERLINKS = YES
# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
# plain latex in the generated Makefile. Set this option to YES to get a
# higher quality PDF documentation.
-USE_PDFLATEX = NO
+USE_PDFLATEX = YES
# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
# command to the generated LaTeX files. This will instruct LaTeX to keep
Modified: trunk/Externals/scew/etc/autoconf/doxygen.m4
===================================================================
--- trunk/Externals/scew/etc/autoconf/doxygen.m4 2010-06-30 05:34:17 UTC (rev 7211)
+++ trunk/Externals/scew/etc/autoconf/doxygen.m4 2010-07-01 08:36:46 UTC (rev 7212)
@@ -2,7 +2,7 @@
# Author: Aleix Conchillo Flaque <al...@me...>
# Start date: Sun Jul 06, 2003 04:41
#
-# Copyright (C) 2003-2008 Aleix Conchillo Flaque
+# Copyright (C) 2003-2010 Aleix Conchillo Flaque
#
# Locate doxygen and auxiliary programs.
@@ -30,22 +30,29 @@
[ --enable-latex-docs enable LaTeX documentation generation with doxygen (no)], [], [enable_latex_docs=no])
if test "x$enable_doxygen" = xno; then
- enable_doc=no
+ enable_doc=no
else
- AC_PATH_PROG(DOXYGEN, doxygen, , $PATH)
- if test x$DOXYGEN = x; then
+ AC_PATH_PROG(DOXYGEN, doxygen, , $PATH)
+ if test x$DOXYGEN = x; then
AC_MSG_WARN(Could not find 'doxygen' (documentation disabled).)
- enable_doc=no
- else
- enable_doc=yes
+ enable_doc=no
+ else
+ enable_doc=yes
+ if test "x$enable_latex_docs" = xyes; then
+ AC_PATH_PROG(LATEX, latex, , $PATH)
+ if test x$LATEX = x; then
+ AC_MSG_WARN(Could not find 'latex'.)
+ enable_latex_docs=no
+ fi
+ fi
if test "x$enable_dot" = xyes; then
- AC_PATH_PROG(DOT, dot, , $PATH)
+ AC_PATH_PROG(DOT, dot, , $PATH)
if test x$DOT = x; then
AC_MSG_WARN(Could not find 'dot'.)
enable_dot=no
fi
- fi
- fi
+ fi
+ fi
fi
AC_SUBST(enable_dot)
Modified: trunk/Externals/scew/examples/scew_print/scew_print.c
===================================================================
--- trunk/Externals/scew/examples/scew_print/scew_print.c 2010-06-30 05:34:17 UTC (rev 7211)
+++ trunk/Externals/scew/examples/scew_print/scew_print.c 2010-07-01 08:36:46 UTC (rev 7212)
@@ -44,7 +44,7 @@
/* Indentation size (in whitespaces). */
static unsigned int const INDENT_SIZE = 4;
- if (indent > 0)
+ if (indent > 0)
{
scew_printf (_XT("%*s"), indent * INDENT_SIZE, " ");
}
@@ -53,12 +53,12 @@
static void
print_attributes (scew_element *element)
{
- if (element != NULL)
+ if (element != NULL)
{
- /**
- * Iterates through the element's attribute list, printing the
- * pair name-value.
- */
+ /**
+ * Iterates through the element's attribute list, printing the
+ * pair name-value.
+ */
scew_list *list = scew_element_attributes (element);
while (list != NULL)
{
@@ -77,9 +77,9 @@
XML_Char const *contents = NULL;
scew_list *list = NULL;
- if (element == NULL)
+ if (element == NULL)
{
- return;
+ return;
}
/* Prints the starting element tag with its attributes. */
@@ -90,15 +90,15 @@
contents = scew_element_contents (element);
- if (contents == NULL)
+ if (contents == NULL)
{
scew_printf (_XT("\n"));
}
- /**
+ /**
* Call print_element function again for each child of the current
* element.
- */
+ */
list = scew_element_children (element);
while (list != NULL)
{
@@ -107,12 +107,12 @@
list = scew_list_next (list);
}
- /* Prints element's content. */
- if (contents != NULL)
+ /* Prints element's content. */
+ if (contents != NULL)
{
scew_printf (_XT("%s"), contents);
}
- else
+ else
{
print_indent (indent);
}
@@ -135,10 +135,10 @@
_setmode(_fileno(stdout), _O_U16TEXT);
#endif /* _MSC_VER && XML_UNICODE_WCHAR_T */
- if (argc < 2)
+ if (argc < 2)
{
scew_printf (_XT("Usage: scew_print file.xml\n"));
- return EXIT_FAILURE;
+ return EXIT_FAILURE;
}
/* Creates an SCEW parser. This is the first function to call. */
@@ -161,7 +161,7 @@
scew_error code = scew_error_code ();
scew_printf (_XT("Unable to parse file (error #%d: %s)\n"),
code, scew_error_string (code));
- if (code == scew_error_expat)
+ if (code == scew_error_expat)
{
enum XML_Error expat_code = scew_error_expat_code (parser);
scew_printf (_XT("Expat error #%d (line %d, column %d): %s\n"),
@@ -169,7 +169,7 @@
scew_error_expat_line (parser),
scew_error_expat_column (parser),
scew_error_expat_string (expat_code));
- }
+ }
/* Frees the SCEW parser and reader. */
scew_reader_free (reader);
@@ -201,5 +201,5 @@
scew_reader_free (reader);
scew_parser_free (parser);
- return 0;
+ return 0;
}
Modified: trunk/Externals/scew/examples/scew_stream/scew_stream.c
===================================================================
--- trunk/Externals/scew/examples/scew_stream/scew_stream.c 2010-06-30 05:34:17 UTC (rev 7211)
+++ trunk/Externals/scew/examples/scew_stream/scew_stream.c 2010-07-01 08:36:46 UTC (rev 7212)
@@ -94,10 +94,10 @@
_setmode(_fileno(stdout), _O_U16TEXT);
#endif /* _MSC_VER && XML_UNICODE_WCHAR_T */
- if (argc < 2)
+ if (argc < 2)
{
scew_printf (_XT("Usage: scew_stream file.xml\n"));
- return EXIT_FAILURE;
+ return EXIT_FAILURE;
}
/* Create a writer for the standard output. */
@@ -124,19 +124,19 @@
scew_parser_set_tree_hook (parser, tree_hook_, NULL);
scew_parser_set_element_hook (parser, element_hook_, NULL);
if (!scew_parser_load_stream (parser, reader))
- {
+ {
scew_error code = scew_error_code ();
scew_printf (_XT("Unable to load file (error #%d: %s)\n"),
code, scew_error_string (code));
- if (code == scew_error_expat)
- {
+ if (code == scew_error_expat)
+ {
enum XML_Error expat_code = scew_error_expat_code (parser);
scew_printf (_XT("Expat error #%d (line %d, column %d): %s\n"),
- expat_code,
+ expat_code,
scew_error_expat_line (parser),
scew_error_expat_column (parser),
scew_error_expat_string (expat_code));
- }
+ }
/* Frees the SCEW parser, printer, reader and writer. */
scew_reader_free (reader);
@@ -144,8 +144,8 @@
scew_writer_free (stdout_writer_);
scew_printer_free (stdout_printer_);
- return EXIT_FAILURE;
- }
+ return EXIT_FAILURE;
+ }
/* Frees the SCEW parser, printer, reader and writer. */
scew_reader_free (reader);
@@ -153,5 +153,5 @@
scew_writer_free (stdout_writer_);
scew_printer_free (stdout_printer_);
- return 0;
+ return 0;
}
Modified: trunk/Externals/scew/examples/scew_write/scew_write.c
===================================================================
--- trunk/Externals/scew/examples/scew_write/scew_write.c 2010-06-30 05:34:17 UTC (rev 7211)
+++ trunk/Externals/scew/examples/scew_write/scew_write.c 2010-07-01 08:36:46 UTC (rev 7212)
@@ -76,37 +76,37 @@
_setmode(_fileno(stdout), _O_U16TEXT);
#endif /* _MSC_VER && XML_UNICODE_WCHAR_T */
- if (argc < 2)
+ if (argc < 2)
{
scew_printf (_XT("Usage: scew_write new_file.xml\n"));
- return EXIT_FAILURE;
+ return EXIT_FAILURE;
}
- /**
- * Create an empty XML tree in memory, and add a root element
- * "scew_test".
- */
+ /**
+ * Create an empty XML tree in memory, and add a root element
+ * "scew_test".
+ */
tree = scew_tree_create ();
#ifdef XML_UNICODE_WCHAR_T
scew_tree_set_xml_encoding(tree, _XT("UTF-16"));
#endif /* XML_UNICODE_WCHAR_T */
root = scew_tree_set_root (tree, _XT("test"));
- /* Add an element and set element contents. */
+ /* Add an element and set element contents. */
element = scew_element_add (root, _XT("element"));
scew_element_set_contents (element, _XT("element contents"));
- /* Add an element with an attribute pair (name, value). */
+ /* Add an element with an attribute pair (name, value). */
element = scew_element_add (root, _XT("element"));
scew_element_add_attribute_pair (element, _XT("attribute"), _XT("value"));
element = scew_element_add (root, _XT("element"));
scew_element_add_attribute_pair (element, _XT("attribute1"), _XT("value1"));
- /**
- * Another way to add an attribute. You loose attribute ownership,
- * so there is no need to free it.
- */
+ /**
+ * Another way to add an attribute. You loose attribute ownership,
+ * so there is no need to free it.
+ */
attribute = scew_attribute_create (_XT("attribute2"), _XT("value2"));
scew_element_add_attribute (element, attribute);
@@ -128,7 +128,7 @@
_XT("attribute2"), _XT("value2"));
scew_element_add_attribute_pair (sub_sub_element,
_XT("attribute3"), _XT("value3"));
- /* Check attribute2 replacement. */
+ /* Check attribute2 replacement. */
scew_element_add_attribute_pair (sub_sub_element,
_XT("attribute2"), _XT("new_value2"));
scew_element_set_contents (sub_sub_element,
@@ -146,7 +146,7 @@
if (printer == NULL)
{
printf ("Unable to create printer\n");
- return EXIT_FAILURE;
+ return EXIT_FAILURE;
}
/* We should check for errors here. */
@@ -175,5 +175,5 @@
scew_printer_free (printer);
scew_tree_free (tree);
- return 0;
+ return 0;
}
Modified: trunk/Externals/scew/scew/attribute.c
===================================================================
--- trunk/Externals/scew/scew/attribute.c 2010-06-30 05:34:17 UTC (rev 7211)
+++ trunk/Externals/scew/scew/attribute.c 2010-07-01 08:36:46 UTC (rev 7212)
@@ -81,11 +81,11 @@
&& (scew_attribute_set_value (new_attr, attribute->value) != NULL);
if (!copied)
- {
+ {
scew_attribute_free (new_attr);
new_attr = NULL;
+ }
}
- }
return new_attr;
}
@@ -122,7 +122,7 @@
{
assert (attribute != NULL);
- return attribute->name;
+ return attribute->name;
}
XML_Char const*
@@ -130,7 +130,7 @@
{
assert (attribute != NULL);
- return attribute->value;
+ return attribute->value;
}
XML_Char const*
Modified: trunk/Externals/scew/scew/element.c
===================================================================
--- trunk/Externals/scew/scew/element.c 2010-06-30 05:34:17 UTC (rev 7211)
+++ trunk/Externals/scew/scew/element.c 2010-07-01 08:36:46 UTC (rev 7212)
@@ -50,16 +50,16 @@
element = calloc (1, sizeof (scew_element));
- if (element != NULL)
+ if (element != NULL)
{
scew_element_set_name (element, name);
}
- else
+ else
{
scew_error_set_last_error_ (scew_error_no_memory);
}
- return element;
+ return element;
}
void
@@ -106,11 +106,11 @@
new_name = scew_strdup (name);
if (new_name != NULL)
- {
+ {
free (element->name);
element->name = new_name;
}
- else
+ else
{
scew_error_set_last_error_ (scew_error_no_memory);
}
@@ -149,7 +149,7 @@
{
free (element->contents);
element->contents = NULL;
- }
+ }
}
@@ -274,7 +274,7 @@
element->last_child = item;
element->n_children += 1;
}
- else
+ else
{
scew_error_set_last_error_ (scew_error_no_memory);
child = NULL;
Modified: trunk/Externals/scew/scew/error.c
===================================================================
--- trunk/Externals/scew/scew/error.c 2010-06-30 05:34:17 UTC (rev 7211)
+++ trunk/Externals/scew/scew/error.c 2010-07-01 08:36:46 UTC (rev 7212)
@@ -47,9 +47,9 @@
{
static XML_Char const *message[] =
{
- _XT("No error"),
- _XT("Out of memory"),
- _XT("Input/Output error"),
+ _XT("No error"),
+ _XT("Out of memory"),
+ _XT("Input/Output error"),
_XT("Error while calling hook"),
_XT("Internal Expat parser error"),
_XT("Internal SCEW error")
@@ -61,7 +61,7 @@
{
return message[code];
}
- else
+ else
{
static XML_Char const *unk_message = _XT("Unknown error code");
Modified: trunk/Externals/scew/scew/parser.c
===================================================================
--- trunk/Externals/scew/scew/parser.c 2010-06-30 05:34:17 UTC (rev 7211)
+++ trunk/Externals/scew/scew/parser.c 2010-07-01 08:36:46 UTC (rev 7212)
@@ -79,13 +79,13 @@
void
scew_parser_free (scew_parser *parser)
{
- if (parser != NULL)
+ if (parser != NULL)
{
/* Free all intermediate parser data (if used before). */
scew_parser_reset (parser);
/* Free Expat parser. */
- if (parser->parser)
+ if (parser->parser)
{
XML_ParserFree (parser->parser);
}
@@ -235,11 +235,11 @@
scew_parser_reset (parser);
}
else
- {
+ {
scew_error_set_last_error_ (scew_error_no_memory);
scew_parser_free (parser);
parser = NULL;
- }
+ }
return parser;
}
@@ -301,7 +301,7 @@
scew_bool done = SCEW_FALSE;
scew_bool result = SCEW_TRUE;
- assert(parser != NULL);
+ assert(parser != NULL);
assert(reader != NULL);
while (!done && result)
@@ -316,7 +316,7 @@
result = SCEW_FALSE;
}
else
- {
+ {
result = parse_stream_buffer_ (parser, buffer, length);
done = ((0 == length) || scew_reader_end (reader));
}
@@ -332,15 +332,15 @@
unsigned int end = 0;
unsigned int length = 0;
- assert(parser != NULL);
- assert(buffer != NULL);
+ assert(parser != NULL);
+ assert(buffer != NULL);
- /**
+ /**
* Loop through the buffer and:
- * if we encounter a '>', send the chunk to Expat.
- * if we hit the end of the buffer, send whatever remains to Expat.
- */
- while ((start < size) && (end <= size))
+ * if we encounter a '>', send the chunk to Expat.
+ * if we hit the end of the buffer, send whatever remains to Expat.
+ */
+ while ((start < size) && (end <= size))
{
/* Skip initial whitespaces. */
while ((start < size) && scew_isspace (buffer[start]))
@@ -351,8 +351,8 @@
if ((end == size) || (buffer[end] == _XT('>')))
{
- length = end - start;
- if (end < size)
+ length = end - start;
+ if (end < size)
{
length += 1;
}
@@ -376,12 +376,12 @@
* We don't need to free last loaded XML, as it's the
* users responsibility.
*/
- parser->tree = NULL;
+ parser->tree = NULL;
/* Reset parser to continue using it. */
scew_parser_reset (parser);
}
- start = end + 1;
+ start = end + 1;
}
end += 1;
}
Modified: trunk/Externals/scew/scew/str.c
===================================================================
--- trunk/Externals/scew/scew/str.c 2010-06-30 05:34:17 UTC (rev 7211)
+++ trunk/Externals/scew/scew/str.c 2010-07-01 08:36:46 UTC (rev 7212)
@@ -129,9 +129,9 @@
/* Strip leading whitespace. */
start = scew_strspn (src, _XT(" \n\r\t\v"));
- total = end - start;
+ total = end - start;
scew_memmove (src, &src[start], total);
- src[total] = _XT('\0');
+ src[total] = _XT('\0');
}
scew_bool
Modified: trunk/Externals/scew/scew/str.h
===================================================================
--- trunk/Externals/scew/scew/str.h 2010-06-30 05:34:17 UTC (rev 7211)
+++ trunk/Externals/scew/scew/str.h 2010-07-01 08:36:46 UTC (rev 7212)
@@ -73,10 +73,10 @@
#include <wchar.h>
#include <wctype.h>
-#define _XT(str) L##str
+#define _XT(str) L##str
#define scew_printf wprintf
-#define scew_fprintf fwprintf
+#define scew_fprintf fwprintf
#define scew_vfprintf vfwprintf
#define scew_fputs fputws
#define scew_fgets fgetws
@@ -109,7 +109,7 @@
/**
* Creates a regular string or a wide character string.
*/
-#define _XT(str) str
+#define _XT(str) str
/**
* See standard @a printf documentation.
@@ -119,7 +119,7 @@
/**
* See standard @a fprintf documentation.
*/
-#define scew_fprintf fprintf
+#define scew_fprintf fprintf
/**
* See standard @a vfprintf documentation.
Modified: trunk/Externals/scew/scew/tree.c
===================================================================
--- trunk/Externals/scew/scew/tree.c 2010-06-30 05:34:17 UTC (rev 7211)
+++ trunk/Externals/scew/scew/tree.c 2010-07-01 08:36:46 UTC (rev 7212)
@@ -71,7 +71,7 @@
scew_error_set_last_error_ (scew_error_no_memory);
}
- return tree;
+ return tree;
}
scew_tree*
@@ -112,7 +112,7 @@
void
scew_tree_free (scew_tree *tree)
{
- if (tree != NULL)
+ if (tree != NULL)
{
free (tree->version);
free (tree->encoding);
@@ -146,7 +146,7 @@
XML_Char const*
scew_tree_xml_version (scew_tree const *tree)
{
- assert(tree != NULL);
+ assert(tree != NULL);
return tree->version;
}
@@ -165,7 +165,7 @@
XML_Char const*
scew_tree_xml_encoding (scew_tree const *tree)
{
- assert(tree != NULL);
+ assert(tree != NULL);
return tree->encoding;
}
@@ -192,9 +192,9 @@
void
scew_tree_set_xml_standalone (scew_tree *tree, scew_tree_standalone standalone)
{
- assert(tree != NULL);
+ assert(tree != NULL);
- tree->standalone = standalone;
+ tree->standalone = standalone;
}
Modified: trunk/Externals/scew/scew/xerror.c
===================================================================
--- trunk/Externals/scew/scew/xerror.c 2010-06-30 05:34:17 UTC (rev 7211)
+++ trunk/Externals/scew/scew/xerror.c 2010-07-01 08:36:46 UTC (rev 7212)
@@ -48,13 +48,13 @@
void
scew_error_set_last_error_ (scew_error code)
{
- last_error = code;
+ last_error = code;
}
scew_error
scew_error_last_error_ (void)
{
- return last_error;
+ return last_error;
}
#else /* SINGLE_THREADED */
@@ -148,7 +148,7 @@
error = (scew_error*) pthread_getspecific (key_error_);
if (NULL == error)
{
- return scew_error_none;
+ return scew_error_none;
}
return *error;
Modified: trunk/Externals/scew/scew/xparser.c
===================================================================
--- trunk/Externals/scew/scew/xparser.c 2010-06-30 05:34:17 UTC (rev 7211)
+++ trunk/Externals/scew/scew/xparser.c 2010-07-01 08:36:46 UTC (rev 7212)
@@ -113,11 +113,11 @@
{
scew_element *element = parser_stack_pop_ (parser);
while (element != NULL)
- {
+ {
scew_element_free (element);
element = parser_stack_pop_ (parser);
+ }
}
- }
}
void
@@ -325,7 +325,10 @@
free (parser->preamble);
parser->preamble = NULL;
}
- scew_tree_set_xml_preamble (parser->tree, parser->preamble);
+ else
+ {
+ scew_tree_set_xml_preamble (parser->tree, parser->preamble);
+ }
}
scew_tree_set_root_element (parser->tree, current);
@@ -454,7 +457,7 @@
stack = calloc (1, sizeof (stack_element));
- if (stack != NULL)
+ if (stack != NULL)
{
stack->element = element;
if (parser->stack != NULL)
@@ -483,5 +486,5 @@
free (stack);
}
- return element;
+ return element;
}
Modified: trunk/Externals/versions.txt
===================================================================
--- trunk/Externals/versions.txt 2010-06-30 05:34:17 UTC (rev 7211)
+++ trunk/Externals/versions.txt 2010-07-01 08:36:46 UTC (rev 7212)
@@ -5,4 +5,4 @@
Expat: 2.0.1
PCRE: 8.10
-SCEW: 1.1.1
+SCEW: 1.1.2
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2010-06-30 05:34:24
|
Revision: 7211
http://winmerge.svn.sourceforge.net/winmerge/?rev=7211&view=rev
Author: jtuc
Date: 2010-06-30 05:34:17 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
PATCH: [ 3012200 ] Defer unicode conversion to diffutils
Modified Paths:
--------------
trunk/Src/diffutils/src/IO.C
Modified: trunk/Src/diffutils/src/IO.C
===================================================================
--- trunk/Src/diffutils/src/IO.C 2010-06-29 21:11:39 UTC (rev 7210)
+++ trunk/Src/diffutils/src/IO.C 2010-06-30 05:34:17 UTC (rev 7211)
@@ -38,7 +38,18 @@
/* Type used for fast prefix comparison in find_identical_ends. */
typedef unsigned word;
-
+
+/** @brief Known Unicode encodings. */
+enum UNICODESET
+{
+ NONE = 0, /**< No unicode. */
+ UCS2LE, /**< UCS-2 / UTF-16 little endian. */
+ UCS2BE, /**< UCS-2 / UTF-16 big endian. */
+ UTF8, /**< UTF-8. */
+ UCS4LE, /**< UTF-32 little endian */
+ UCS4BE, /**< UTF-32 big-endian */
+};
+
/* Lines are put into equivalence classes (of lines that match in line_cmp).
Each equivalence class is represented by one of these structures,
but only while the classes are being computed.
@@ -70,8 +81,9 @@
static void find_and_hash_each_line PARAMS((struct file_data *));
static void find_identical_ends PARAMS((struct file_data[]));
-static void prepare_text_end PARAMS((struct file_data *));
-
+static char *prepare_text_end PARAMS((struct file_data *));
+static enum UNICODESET get_unicode_signature(struct file_data *);
+
/* Check for binary files and compare them for exact identity. */
/* Return 1 if BUF contains a non text character.
@@ -79,6 +91,32 @@
#define binary_file_p(buf, size) (size != 0 && memchr (buf, '\0', size) != 0)
+/** @brief Get unicode signature from file_data. */
+static enum UNICODESET get_unicode_signature(struct file_data *current)
+{
+ // initialize to a pattern that differs everywhere from all possible unicode signatures
+ unsigned long sig = 0x3F3F3F3F;
+ // copy at most 4 bytes from buffer
+ memcpy(&sig, current->buffer, min(current->buffered_chars, 4));
+ // check for the two possible 4 bytes signatures
+ if (sig == 0x0000FEFF)
+ return UCS4LE;
+ if (sig == 0xFFFE0000)
+ return UCS4BE;
+ // check for the only possible 3 bytes signature
+ sig &= 0xFFFFFF;
+ if (sig == 0xBFBBEF)
+ return UTF8;
+ // check for the two possible 2 bytes signatures
+ sig &= 0xFFFF;
+ if (sig == 0xFEFF)
+ return UCS2LE;
+ if (sig == 0xFFFE)
+ return UCS2BE;
+ // none of the above checks has passed, so probably no unicode
+ return NONE;
+}
+
/* Get ready to read the current file.
Return nonzero if SKIP_TEST is zero,
and if it appears to be a binary file. */
@@ -101,15 +139,6 @@
{
current->bufsize = current->buffered_chars
= STAT_BLOCKSIZE (current->stat);
-
- if (S_ISREG (current->stat.st_mode))
- /* Get the size out of the stat block.
- Allocate enough room for appended newline and sentinel.
- Allocate at least one block, to prevent overrunning the buffer
- when comparing growing binary files. */
- current->bufsize = max (current->bufsize,
- current->stat.st_size + sizeof (word) + 1);
-
#ifdef __MSDOS__
if ((current->buffer = (char HUGE *) farmalloc (current->bufsize)) == NULL)
fatal ("far memory exhausted");
@@ -150,52 +179,40 @@
if (current->desc < 0)
/* The file is nonexistent. */
;
- else if (S_ISREG (current->stat.st_mode))
+ else if (always_text_flag || current->buffered_chars != 0)
{
- /* It's a regular file; slurp in the rest all at once. */
-#ifdef __MSDOS__
- /* read inside of segment boundaries */
- while ((current->stat.st_size - current->buffered_chars) > 0)
- {
- unsigned nr;
- char HUGE *rp;
+ enum UNICODESET sig = get_unicode_signature(current);
+ size_t alloc_extra
+ = (1 << sig) & ((1 << UCS2LE) | (1 << UCS2BE) | (1 << UCS4LE) | (1 << UCS4BE))
+ // some flavor of non octet encoded unicode?
+ ? ~0U // yes, allocate extra room for transcoding
+ : 0U; // no, allocate no extra room for transcoding
- rp = current->buffer + current->buffered_chars;
- nr = 0 - (unsigned)((long)rp & 0x0000FFFF);
- if (nr == 0)
- nr = 0xFFF0;
- nr = read (current->desc, rp, nr);
- if (nr == 0)
- break;
- if (nr == 0xFFFF)
- pfatal_with_name (current->name);
- current->buffered_chars += nr ;
- }
-#else
- cc = current->stat.st_size - current->buffered_chars;
- if (cc)
- {
- cc = read (current->desc,
- current->buffer + current->buffered_chars,
- cc);
- if (cc == -1)
- pfatal_with_name (current->name);
- current->buffered_chars += cc;
- }
-#endif /*__MSDOS__*/
- }
- /* It's not a regular file; read it, growing the buffer as needed. */
- else if (always_text_flag || current->buffered_chars != 0)
- {
for (;;)
{
if (current->buffered_chars == current->bufsize)
{
+ if (S_ISREG (current->stat.st_mode))
+ {
+ /* Get the size out of the stat block.
+ Allocate 50% extra room for a necessary transcoding to UTF-8.
+ Allocate enough room for appended newline and sentinel.
+ Allocate at least one block, to prevent overrunning the buffer
+ when comparing growing binary files. */
+ current->bufsize = max (current->bufsize,
+ current->stat.st_size + (alloc_extra & current->stat.st_size / 2) + sizeof (word) + 1);
+ }
+ else
+ {
#ifdef __MSDOS__
- current->bufsize += 4096;
- current->buffer = (char HUGE *) farrealloc (current->buffer, current->bufsize);
+ current->bufsize += 4096;
#else
- current->bufsize = current->bufsize * 2;
+ current->bufsize = current->bufsize * 2;
+#endif /*__MSDOS__*/
+ }
+#ifdef __MSDOS__
+ current->buffer = (char HUGE *) farrealloc (current->buffer, current->bufsize);
+#else
current->buffer = xrealloc (current->buffer, current->bufsize);
#endif /*__MSDOS__*/
}
@@ -209,8 +226,9 @@
current->buffered_chars += cc;
}
#ifndef __MSDOS__
- /* Allocate just enough room for appended newline and sentinel. */
- current->bufsize = current->buffered_chars + sizeof (word) + 1;
+ /* Allocate 50% extra room for a necessary transcoding to UTF-8.
+ Allocate enough room for appended newline and sentinel. */
+ current->bufsize = current->buffered_chars + (alloc_extra & current->buffered_chars / 2) + sizeof (word) + 1;
current->buffer = xrealloc (current->buffer, current->bufsize);
#endif /*!__MSDOS__*/
}
@@ -503,32 +521,207 @@
equivs_alloc = eqs_alloc;
equivs_index = eqs_index;
}
-
-/* Prepare the end of the text. Make sure it's initialized.
+
+/* Convert any non octet encoded unicode text to UTF-8.
+ Prepare the end of the text. Make sure it's initialized.
Make sure text ends in a newline,
- but remember that we had to add one unless -B is in effect. */
+ but remember that we had to add one unless -B is in effect.
+ Return effective start of text to be compared. */
-static void
+static char *
prepare_text_end (current)
struct file_data *current;
{
FSIZE buffered_chars = current->buffered_chars;
- char HUGE *p = current->buffer;
+ char *const p = current->buffer;
+ char *r = p; // receives the return value
+ enum UNICODESET sig = get_unicode_signature(current);
+
+ if (sig == UCS4LE)
+ {
+ FSIZE buffered_words = buffered_chars / 2;
+ unsigned long *q = (unsigned long *)p + buffered_words / 2;
+ buffered_chars += buffered_words;
+ r = p + buffered_chars;
+ while (--q > (unsigned long *)p) // exclude the BOM
+ {
+ unsigned long u = *q;
+ if (u >= 0x80000000)
+ {
+ *--r = '?';
+ }
+ else if (u >= 0x4000000)
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0x80 + ((u >> 6) & 0x3F);
+ *--r = 0x80 + ((u >> 12) & 0x3F);
+ *--r = 0x80 + ((u >> 18) & 0x3F);
+ *--r = 0x80 + ((u >> 24) & 0x3F);
+ *--r = 0xFC + (u >> 30);
+ }
+ else if (u >= 0x200000)
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0x80 + ((u >> 6) & 0x3F);
+ *--r = 0x80 + ((u >> 12) & 0x3F);
+ *--r = 0x80 + ((u >> 18) & 0x3F);
+ *--r = 0xF8 + (u >> 24);
+ }
+ else if (u >= 0x10000)
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0x80 + ((u >> 6) & 0x3F);
+ *--r = 0x80 + ((u >> 12) & 0x3F);
+ *--r = 0xF0 + (char)(u >> 18);
+ }
+ else if (u >= 0x800)
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0x80 + ((u >> 6) & 0x3F);
+ *--r = 0xE0 + (char)(u >> 12);
+ }
+ else if (u >= 0x80 || u == 0) // map NUL to 2 byte sequence so as to prevent it from confusing diff algorithm
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0xC0 + (char)(u >> 6);
+ }
+ else
+ {
+ *--r = (char)u;
+ }
+ }
+ }
+ else if (sig == UCS4BE)
+ {
+ FSIZE buffered_words = buffered_chars / 2;
+ unsigned long *q = (unsigned long *)p + buffered_words / 2;
+ buffered_chars += buffered_words;
+ r = p + buffered_chars;
+ while (--q > (unsigned long *)p) // exclude the BOM
+ {
+ unsigned long u =
+ ((*q & 0x000000FF) << 24) |
+ ((*q & 0x0000FF00) << 8) |
+ ((*q & 0x00FF0000) >> 8) |
+ ((*q & 0xFF000000) >> 24); // fix byte order
+ if (u >= 0x80000000)
+ {
+ *--r = '?';
+ }
+ else if (u >= 0x4000000)
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0x80 + ((u >> 6) & 0x3F);
+ *--r = 0x80 + ((u >> 12) & 0x3F);
+ *--r = 0x80 + ((u >> 18) & 0x3F);
+ *--r = 0x80 + ((u >> 24) & 0x3F);
+ *--r = 0xFC + (u >> 30);
+ }
+ else if (u >= 0x200000)
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0x80 + ((u >> 6) & 0x3F);
+ *--r = 0x80 + ((u >> 12) & 0x3F);
+ *--r = 0x80 + ((u >> 18) & 0x3F);
+ *--r = 0xF8 + (u >> 24);
+ }
+ else if (u >= 0x10000)
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0x80 + ((u >> 6) & 0x3F);
+ *--r = 0x80 + ((u >> 12) & 0x3F);
+ *--r = 0xF0 + (char)(u >> 18);
+ }
+ else if (u >= 0x800)
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0x80 + ((u >> 6) & 0x3F);
+ *--r = 0xE0 + (char)(u >> 12);
+ }
+ else if (u >= 0x80 || u == 0) // map NUL to 2 byte sequence so as to prevent it from confusing diff algorithm
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0xC0 + (char)(u >> 6);
+ }
+ else
+ {
+ *--r = (char)u;
+ }
+ }
+ }
+ else if (sig == UCS2LE)
+ {
+ FSIZE buffered_words = buffered_chars / 2;
+ unsigned short *q = (unsigned short *)p + buffered_words;
+ buffered_chars += buffered_words;
+ r = p + buffered_chars;
+ while (--q > (unsigned short *)p) // exclude the BOM
+ {
+ unsigned short u = *q;
+ if (u >= 0x800)
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0x80 + ((u >> 6) & 0x3F);
+ *--r = 0xE0 + (u >> 12);
+ }
+ else if (u >= 0x80 || u == 0) // map NUL to 2 byte sequence so as to prevent it from confusing diff algorithm
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0xC0 + (u >> 6);
+ }
+ else
+ {
+ *--r = (char)u;
+ }
+ }
+ }
+ else if (sig == UCS2BE)
+ {
+ FSIZE buffered_words = buffered_chars / 2;
+ unsigned short *q = (unsigned short *)p + buffered_words;
+ buffered_chars += buffered_words;
+ r = p + buffered_chars;
+ while (--q > (unsigned short *)p) // exclude the BOM
+ {
+ unsigned short u = (*q << 8) | (*q >> 8); // fix byte order
+ if (u >= 0x800)
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0x80 + ((u >> 6) & 0x3F);
+ *--r = 0xE0 + (u >> 12);
+ }
+ else if (u >= 0x80 || u == 0) // map NUL to 2 byte sequence so as to prevent it from confusing diff algorithm
+ {
+ *--r = 0x80 + (u & 0x3F);
+ *--r = 0xC0 + (u >> 6);
+ }
+ else
+ {
+ *--r = (char)u;
+ }
+ }
+ }
+ else if (sig == UTF8)
+ {
+ r = p + 3; // skip the BOM
+ }
+
if (buffered_chars == 0 || p[buffered_chars - 1] == '\n' || p[buffered_chars - 1] == '\r')
current->missing_newline = 0;
else
{
p[buffered_chars++] = '\n';
- current->buffered_chars = buffered_chars;
current->missing_newline = 1;
}
+ current->buffered_chars = buffered_chars;
/* Don't use uninitialized storage when planting or using sentinels. */
if (p)
bzero (p + buffered_chars, sizeof (word));
+ return r;
}
-
+
/* Given a vector of two file_data objects, find the identical
prefixes and suffixes of each object. */
@@ -548,24 +741,27 @@
int ttt;
slurp (&filevec[0]);
+ buffer0 = prepare_text_end (&filevec[0]);
if (filevec[0].desc != filevec[1].desc)
- slurp (&filevec[1]);
+ {
+ slurp (&filevec[1]);
+ buffer1 = prepare_text_end (&filevec[1]);
+ }
else
{
filevec[1].buffer = filevec[0].buffer;
filevec[1].bufsize = filevec[0].bufsize;
filevec[1].buffered_chars = filevec[0].buffered_chars;
+ buffer1 = buffer0;
}
- for (i = 0; i < 2; i++)
- prepare_text_end (&filevec[i]);
/* Find identical prefix. */
- p0 = buffer0 = filevec[0].buffer;
- p1 = buffer1 = filevec[1].buffer;
+ p0 = buffer0;
+ p1 = buffer1;
- n0 = filevec[0].buffered_chars;
- n1 = filevec[1].buffered_chars;
+ n0 = filevec[0].buffered_chars - (buffer0 - filevec[0].buffer);
+ n1 = filevec[1].buffered_chars - (buffer1 - filevec[1].buffer);
if (p0 == p1)
/* The buffers are the same; sentinels won't work. */
@@ -763,7 +959,7 @@
filevec[1].alloc_lines = alloc_lines1 - buffered_prefix;
filevec[0].prefix_lines = filevec[1].prefix_lines = lines;
}
-
+
/* Largest primes less than some power of two, for nbuckets. Values range
from useful to preposterous. If one of these numbers isn't prime
after all, don't blame it on me, blame it on primes (6) . . . */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-06-29 21:11:48
|
Revision: 7210
http://winmerge.svn.sourceforge.net/winmerge/?rev=7210&view=rev
Author: kimmov
Date: 2010-06-29 21:11:39 +0000 (Tue, 29 Jun 2010)
Log Message:
-----------
Update to PCRE 8.10.
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Externals/pcre/AUTHORS
trunk/Externals/pcre/CMakeLists.txt
trunk/Externals/pcre/ChangeLog
trunk/Externals/pcre/INSTALL
trunk/Externals/pcre/LICENCE
trunk/Externals/pcre/Makefile.am
trunk/Externals/pcre/Makefile.in
trunk/Externals/pcre/NEWS
trunk/Externals/pcre/NON-UNIX-USE
trunk/Externals/pcre/README
trunk/Externals/pcre/RunTest
trunk/Externals/pcre/Win32/pcre.h
trunk/Externals/pcre/Win32/pcre_chartables.c
trunk/Externals/pcre/Win64/pcre.h
trunk/Externals/pcre/Win64/pcre_chartables.c
trunk/Externals/pcre/aclocal.m4
trunk/Externals/pcre/config.guess
trunk/Externals/pcre/config.h.generic
trunk/Externals/pcre/config.h.in
trunk/Externals/pcre/config.sub
trunk/Externals/pcre/configure
trunk/Externals/pcre/configure.ac
trunk/Externals/pcre/depcomp
trunk/Externals/pcre/doc/html/pcre.html
trunk/Externals/pcre/doc/html/pcre_compile.html
trunk/Externals/pcre/doc/html/pcre_compile2.html
trunk/Externals/pcre/doc/html/pcreapi.html
trunk/Externals/pcre/doc/html/pcrecompat.html
trunk/Externals/pcre/doc/html/pcredemo.html
trunk/Externals/pcre/doc/html/pcregrep.html
trunk/Externals/pcre/doc/html/pcrepattern.html
trunk/Externals/pcre/doc/html/pcreperform.html
trunk/Externals/pcre/doc/html/pcreposix.html
trunk/Externals/pcre/doc/html/pcresample.html
trunk/Externals/pcre/doc/html/pcrestack.html
trunk/Externals/pcre/doc/html/pcresyntax.html
trunk/Externals/pcre/doc/html/pcretest.html
trunk/Externals/pcre/doc/pcre.3
trunk/Externals/pcre/doc/pcre.txt
trunk/Externals/pcre/doc/pcre_compile.3
trunk/Externals/pcre/doc/pcre_compile2.3
trunk/Externals/pcre/doc/pcreapi.3
trunk/Externals/pcre/doc/pcrecompat.3
trunk/Externals/pcre/doc/pcregrep.1
trunk/Externals/pcre/doc/pcregrep.txt
trunk/Externals/pcre/doc/pcrepattern.3
trunk/Externals/pcre/doc/pcreperform.3
trunk/Externals/pcre/doc/pcreposix.3
trunk/Externals/pcre/doc/pcresample.3
trunk/Externals/pcre/doc/pcrestack.3
trunk/Externals/pcre/doc/pcresyntax.3
trunk/Externals/pcre/doc/pcretest.1
trunk/Externals/pcre/doc/pcretest.txt
trunk/Externals/pcre/install-sh
trunk/Externals/pcre/ltmain.sh
trunk/Externals/pcre/missing
trunk/Externals/pcre/pcre-config.in
trunk/Externals/pcre/pcre.h.generic
trunk/Externals/pcre/pcre.h.in
trunk/Externals/pcre/pcre_chartables.c.dist
trunk/Externals/pcre/pcre_compile.c
trunk/Externals/pcre/pcre_dfa_exec.c
trunk/Externals/pcre/pcre_exec.c
trunk/Externals/pcre/pcre_globals.c
trunk/Externals/pcre/pcre_internal.h
trunk/Externals/pcre/pcre_printint.src
trunk/Externals/pcre/pcre_scanner.cc
trunk/Externals/pcre/pcre_scanner_unittest.cc
trunk/Externals/pcre/pcre_study.c
trunk/Externals/pcre/pcre_tables.c
trunk/Externals/pcre/pcre_ucd.c
trunk/Externals/pcre/pcre_xclass.c
trunk/Externals/pcre/pcrecpp.cc
trunk/Externals/pcre/pcrecpp.h
trunk/Externals/pcre/pcrecpp_unittest.cc
trunk/Externals/pcre/pcredemo.c
trunk/Externals/pcre/pcregexp.pas
trunk/Externals/pcre/pcregrep.c
trunk/Externals/pcre/pcreposix.c
trunk/Externals/pcre/pcreposix.h
trunk/Externals/pcre/pcretest.c
trunk/Externals/pcre/perltest.pl
trunk/Externals/pcre/testdata/testinput1
trunk/Externals/pcre/testdata/testinput10
trunk/Externals/pcre/testdata/testinput11
trunk/Externals/pcre/testdata/testinput12
trunk/Externals/pcre/testdata/testinput2
trunk/Externals/pcre/testdata/testinput5
trunk/Externals/pcre/testdata/testinput6
trunk/Externals/pcre/testdata/testinput7
trunk/Externals/pcre/testdata/testinput9
trunk/Externals/pcre/testdata/testoutput1
trunk/Externals/pcre/testdata/testoutput10
trunk/Externals/pcre/testdata/testoutput11
trunk/Externals/pcre/testdata/testoutput12
trunk/Externals/pcre/testdata/testoutput2
trunk/Externals/pcre/testdata/testoutput5
trunk/Externals/pcre/testdata/testoutput6
trunk/Externals/pcre/testdata/testoutput7
trunk/Externals/pcre/testdata/testoutput9
trunk/Externals/pcre/ucp.h
trunk/Externals/versions.txt
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-06-29 16:44:20 UTC (rev 7209)
+++ trunk/Docs/Users/ChangeLog.txt 2010-06-29 21:11:39 UTC (rev 7210)
@@ -3,6 +3,9 @@
to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL:
http://winmerge.org/tracker/[tracker-id]
+WinMerge 2.13.14
+ Update to PCRE 8.10 (r7210)
+
WinMerge 2.13.13 - 2010-06-19 (r7205)
Improve editing of linefilter regular expressions (#3015416)
Installer: Embed MS runtime files installer for x64 (r7150)
Modified: trunk/Externals/pcre/AUTHORS
===================================================================
--- trunk/Externals/pcre/AUTHORS 2010-06-29 16:44:20 UTC (rev 7209)
+++ trunk/Externals/pcre/AUTHORS 2010-06-29 21:11:39 UTC (rev 7210)
@@ -8,7 +8,7 @@
University of Cambridge Computing Service,
Cambridge, England.
-Copyright (c) 1997-2009 University of Cambridge
+Copyright (c) 1997-2010 University of Cambridge
All rights reserved
@@ -17,7 +17,7 @@
Written by: Google Inc.
-Copyright (c) 2007-2008 Google Inc
+Copyright (c) 2007-2010 Google Inc
All rights reserved
####
Modified: trunk/Externals/pcre/CMakeLists.txt
===================================================================
--- trunk/Externals/pcre/CMakeLists.txt 2010-06-29 16:44:20 UTC (rev 7209)
+++ trunk/Externals/pcre/CMakeLists.txt 2010-06-29 21:11:39 UTC (rev 7210)
@@ -35,6 +35,8 @@
# to disable the final configuration report.
# 2009-04-11 PH applied Christian Ehrlicher's patch to show compiler flags that
# are set by specifying a release type.
+# 2010-01-02 PH added test for stdint.h
+# 2010-03-02 PH addes test for inttypes.h
PROJECT(PCRE C CXX)
@@ -55,6 +57,8 @@
INCLUDE(CheckTypeSize)
CHECK_INCLUDE_FILE(dirent.h HAVE_DIRENT_H)
+CHECK_INCLUDE_FILE(stdint.h HAVE_STDINT_H)
+CHECK_INCLUDE_FILE(inttypes.h HAVE_INTTYPES_H)
CHECK_INCLUDE_FILE(sys/stat.h HAVE_SYS_STAT_H)
CHECK_INCLUDE_FILE(sys/types.h HAVE_SYS_TYPES_H)
CHECK_INCLUDE_FILE(unistd.h HAVE_UNISTD_H)
Modified: trunk/Externals/pcre/ChangeLog
===================================================================
--- trunk/Externals/pcre/ChangeLog 2010-06-29 16:44:20 UTC (rev 7209)
+++ trunk/Externals/pcre/ChangeLog 2010-06-29 21:11:39 UTC (rev 7210)
@@ -1,6 +1,294 @@
ChangeLog for PCRE
------------------
+Version 8.10 25-Jun-2010
+------------------------
+
+1. Added support for (*MARK:ARG) and for ARG additions to PRUNE, SKIP, and
+ THEN.
+
+2. (*ACCEPT) was not working when inside an atomic group.
+
+3. Inside a character class, \B is treated as a literal by default, but
+ faulted if PCRE_EXTRA is set. This mimics Perl's behaviour (the -w option
+ causes the error). The code is unchanged, but I tidied the documentation.
+
+4. Inside a character class, PCRE always treated \R and \X as literals,
+ whereas Perl faults them if its -w option is set. I have changed PCRE so
+ that it faults them when PCRE_EXTRA is set.
+
+5. Added support for \N, which always matches any character other than
+ newline. (It is the same as "." when PCRE_DOTALL is not set.)
+
+6. When compiling pcregrep with newer versions of gcc which may have
+ FORTIFY_SOURCE set, several warnings "ignoring return value of 'fwrite',
+ declared with attribute warn_unused_result" were given. Just casting the
+ result to (void) does not stop the warnings; a more elaborate fudge is
+ needed. I've used a macro to implement this.
+
+7. Minor change to pcretest.c to avoid a compiler warning.
+
+8. Added four artifical Unicode properties to help with an option to make
+ \s etc use properties (see next item). The new properties are: Xan
+ (alphanumeric), Xsp (Perl space), Xps (POSIX space), and Xwd (word).
+
+9. Added PCRE_UCP to make \b, \d, \s, \w, and certain POSIX character classes
+ use Unicode properties. (*UCP) at the start of a pattern can be used to set
+ this option. Modified pcretest to add /W to test this facility. Added
+ REG_UCP to make it available via the POSIX interface.
+
+10. Added --line-buffered to pcregrep.
+
+11. In UTF-8 mode, if a pattern that was compiled with PCRE_CASELESS was
+ studied, and the match started with a letter with a code point greater than
+ 127 whose first byte was different to the first byte of the other case of
+ the letter, the other case of this starting letter was not recognized
+ (#976).
+
+12. If a pattern that was studied started with a repeated Unicode property
+ test, for example, \p{Nd}+, there was the theoretical possibility of
+ setting up an incorrect bitmap of starting bytes, but fortunately it could
+ not have actually happened in practice until change 8 above was made (it
+ added property types that matched character-matching opcodes).
+
+13. pcre_study() now recognizes \h, \v, and \R when constructing a bit map of
+ possible starting bytes for non-anchored patterns.
+
+14. Extended the "auto-possessify" feature of pcre_compile(). It now recognizes
+ \R, and also a number of cases that involve Unicode properties, both
+ explicit and implicit when PCRE_UCP is set.
+
+15. If a repeated Unicode property match (e.g. \p{Lu}*) was used with non-UTF-8
+ input, it could crash or give wrong results if characters with values
+ greater than 0xc0 were present in the subject string. (Detail: it assumed
+ UTF-8 input when processing these items.)
+
+16. Added a lot of (int) casts to avoid compiler warnings in systems where
+ size_t is 64-bit (#991).
+
+17. Added a check for running out of memory when PCRE is compiled with
+ --disable-stack-for-recursion (#990).
+
+18. If the last data line in a file for pcretest does not have a newline on
+ the end, a newline was missing in the output.
+
+19. The default pcre_chartables.c file recognizes only ASCII characters (values
+ less than 128) in its various bitmaps. However, there is a facility for
+ generating tables according to the current locale when PCRE is compiled. It
+ turns out that in some environments, 0x85 and 0xa0, which are Unicode space
+ characters, are recognized by isspace() and therefore were getting set in
+ these tables, and indeed these tables seem to approximate to ISO 8859. This
+ caused a problem in UTF-8 mode when pcre_study() was used to create a list
+ of bytes that can start a match. For \s, it was including 0x85 and 0xa0,
+ which of course cannot start UTF-8 characters. I have changed the code so
+ that only real ASCII characters (less than 128) and the correct starting
+ bytes for UTF-8 encodings are set for characters greater than 127 when in
+ UTF-8 mode. (When PCRE_UCP is set - see 9 above - the code is different
+ altogether.)
+
+20. Added the /T option to pcretest so as to be able to run tests with non-
+ standard character tables, thus making it possible to include the tests
+ used for 19 above in the standard set of tests.
+
+21. A pattern such as (?&t)(?#()(?(DEFINE)(?<t>a)) which has a forward
+ reference to a subpattern the other side of a comment that contains an
+ opening parenthesis caused either an internal compiling error, or a
+ reference to the wrong subpattern.
+
+
+Version 8.02 19-Mar-2010
+------------------------
+
+1. The Unicode data tables have been updated to Unicode 5.2.0.
+
+2. Added the option --libs-cpp to pcre-config, but only when C++ support is
+ configured.
+
+3. Updated the licensing terms in the pcregexp.pas file, as agreed with the
+ original author of that file, following a query about its status.
+
+4. On systems that do not have stdint.h (e.g. Solaris), check for and include
+ inttypes.h instead. This fixes a bug that was introduced by change 8.01/8.
+
+5. A pattern such as (?&t)*+(?(DEFINE)(?<t>.)) which has a possessive
+ quantifier applied to a forward-referencing subroutine call, could compile
+ incorrect code or give the error "internal error: previously-checked
+ referenced subpattern not found".
+
+6. Both MS Visual Studio and Symbian OS have problems with initializing
+ variables to point to external functions. For these systems, therefore,
+ pcre_malloc etc. are now initialized to local functions that call the
+ relevant global functions.
+
+7. There were two entries missing in the vectors called coptable and poptable
+ in pcre_dfa_exec.c. This could lead to memory accesses outsize the vectors.
+ I've fixed the data, and added a kludgy way of testing at compile time that
+ the lengths are correct (equal to the number of opcodes).
+
+8. Following on from 7, I added a similar kludge to check the length of the
+ eint vector in pcreposix.c.
+
+9. Error texts for pcre_compile() are held as one long string to avoid too
+ much relocation at load time. To find a text, the string is searched,
+ counting zeros. There was no check for running off the end of the string,
+ which could happen if a new error number was added without updating the
+ string.
+
+10. \K gave a compile-time error if it appeared in a lookbehind assersion.
+
+11. \K was not working if it appeared in an atomic group or in a group that
+ was called as a "subroutine", or in an assertion. Perl 5.11 documents that
+ \K is "not well defined" if used in an assertion. PCRE now accepts it if
+ the assertion is positive, but not if it is negative.
+
+12. Change 11 fortuitously reduced the size of the stack frame used in the
+ "match()" function of pcre_exec.c by one pointer. Forthcoming
+ implementation of support for (*MARK) will need an extra pointer on the
+ stack; I have reserved it now, so that the stack frame size does not
+ decrease.
+
+13. A pattern such as (?P<L1>(?P<L2>0)|(?P>L2)(?P>L1)) in which the only other
+ item in branch that calls a recursion is a subroutine call - as in the
+ second branch in the above example - was incorrectly given the compile-
+ time error "recursive call could loop indefinitely" because pcre_compile()
+ was not correctly checking the subroutine for matching a non-empty string.
+
+14. The checks for overrunning compiling workspace could trigger after an
+ overrun had occurred. This is a "should never occur" error, but it can be
+ triggered by pathological patterns such as hundreds of nested parentheses.
+ The checks now trigger 100 bytes before the end of the workspace.
+
+15. Fix typo in configure.ac: "srtoq" should be "strtoq".
+
+
+Version 8.01 19-Jan-2010
+------------------------
+
+1. If a pattern contained a conditional subpattern with only one branch (in
+ particular, this includes all (*DEFINE) patterns), a call to pcre_study()
+ computed the wrong minimum data length (which is of course zero for such
+ subpatterns). This could cause incorrect "no match" results.
+
+2. For patterns such as (?i)a(?-i)b|c where an option setting at the start of
+ the pattern is reset in the first branch, pcre_compile() failed with
+ "internal error: code overflow at offset...". This happened only when
+ the reset was to the original external option setting. (An optimization
+ abstracts leading options settings into an external setting, which was the
+ cause of this.)
+
+3. A pattern such as ^(?!a(*SKIP)b) where a negative assertion contained one
+ of the verbs SKIP, PRUNE, or COMMIT, did not work correctly. When the
+ assertion pattern did not match (meaning that the assertion was true), it
+ was incorrectly treated as false if the SKIP had been reached during the
+ matching. This also applied to assertions used as conditions.
+
+4. If an item that is not supported by pcre_dfa_exec() was encountered in an
+ assertion subpattern, including such a pattern used as a condition,
+ unpredictable results occurred, instead of the error return
+ PCRE_ERROR_DFA_UITEM.
+
+5. The C++ GlobalReplace function was not working like Perl for the special
+ situation when an empty string is matched. It now does the fancy magic
+ stuff that is necessary.
+
+6. In pcre_internal.h, obsolete includes to setjmp.h and stdarg.h have been
+ removed. (These were left over from very, very early versions of PCRE.)
+
+7. Some cosmetic changes to the code to make life easier when compiling it
+ as part of something else:
+
+ (a) Change DEBUG to PCRE_DEBUG.
+
+ (b) In pcre_compile(), rename the member of the "branch_chain" structure
+ called "current" as "current_branch", to prevent a collision with the
+ Linux macro when compiled as a kernel module.
+
+ (c) In pcre_study(), rename the function set_bit() as set_table_bit(), to
+ prevent a collision with the Linux macro when compiled as a kernel
+ module.
+
+8. In pcre_compile() there are some checks for integer overflows that used to
+ cast potentially large values to (double). This has been changed to that
+ when building, a check for int64_t is made, and if it is found, it is used
+ instead, thus avoiding the use of floating point arithmetic. (There is no
+ other use of FP in PCRE.) If int64_t is not found, the fallback is to
+ double.
+
+9. Added two casts to avoid signed/unsigned warnings from VS Studio Express
+ 2005 (difference between two addresses compared to an unsigned value).
+
+10. Change the standard AC_CHECK_LIB test for libbz2 in configure.ac to a
+ custom one, because of the following reported problem in Windows:
+
+ - libbz2 uses the Pascal calling convention (WINAPI) for the functions
+ under Win32.
+ - The standard autoconf AC_CHECK_LIB fails to include "bzlib.h",
+ therefore missing the function definition.
+ - The compiler thus generates a "C" signature for the test function.
+ - The linker fails to find the "C" function.
+ - PCRE fails to configure if asked to do so against libbz2.
+
+11. When running libtoolize from libtool-2.2.6b as part of autogen.sh, these
+ messages were output:
+
+ Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and
+ rerunning libtoolize, to keep the correct libtool macros in-tree.
+ Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
+
+ I have done both of these things.
+
+12. Although pcre_dfa_exec() does not use nearly as much stack as pcre_exec()
+ most of the time, it *can* run out if it is given a pattern that contains a
+ runaway infinite recursion. I updated the discussion in the pcrestack man
+ page.
+
+13. Now that we have gone to the x.xx style of version numbers, the minor
+ version may start with zero. Using 08 or 09 is a bad idea because users
+ might check the value of PCRE_MINOR in their code, and 08 or 09 may be
+ interpreted as invalid octal numbers. I've updated the previous comment in
+ configure.ac, and also added a check that gives an error if 08 or 09 are
+ used.
+
+14. Change 8.00/11 was not quite complete: code had been accidentally omitted,
+ causing partial matching to fail when the end of the subject matched \W
+ in a UTF-8 pattern where \W was quantified with a minimum of 3.
+
+15. There were some discrepancies between the declarations in pcre_internal.h
+ of _pcre_is_newline(), _pcre_was_newline(), and _pcre_valid_utf8() and
+ their definitions. The declarations used "const uschar *" and the
+ definitions used USPTR. Even though USPTR is normally defined as "const
+ unsigned char *" (and uschar is typedeffed as "unsigned char"), it was
+ reported that: "This difference in casting confuses some C++ compilers, for
+ example, SunCC recognizes above declarations as different functions and
+ generates broken code for hbpcre." I have changed the declarations to use
+ USPTR.
+
+16. GNU libtool is named differently on some systems. The autogen.sh script now
+ tries several variants such as glibtoolize (MacOSX) and libtoolize1x
+ (FreeBSD).
+
+17. Applied Craig's patch that fixes an HP aCC compile error in pcre 8.00
+ (strtoXX undefined when compiling pcrecpp.cc). The patch contains this
+ comment: "Figure out how to create a longlong from a string: strtoll and
+ equivalent. It's not enough to call AC_CHECK_FUNCS: hpux has a strtoll, for
+ instance, but it only takes 2 args instead of 3!"
+
+18. A subtle bug concerned with back references has been fixed by a change of
+ specification, with a corresponding code fix. A pattern such as
+ ^(xa|=?\1a)+$ which contains a back reference inside the group to which it
+ refers, was giving matches when it shouldn't. For example, xa=xaaa would
+ match that pattern. Interestingly, Perl (at least up to 5.11.3) has the
+ same bug. Such groups have to be quantified to be useful, or contained
+ inside another quantified group. (If there's no repetition, the reference
+ can never match.) The problem arises because, having left the group and
+ moved on to the rest of the pattern, a later failure that backtracks into
+ the group uses the captured value from the final iteration of the group
+ rather than the correct earlier one. I have fixed this in PCRE by forcing
+ any group that contains a reference to itself to be an atomic group; that
+ is, there cannot be any backtracking into it once it has completed. This is
+ similar to recursive and subroutine calls.
+
+
Version 8.00 19-Oct-09
----------------------
Modified: trunk/Externals/pcre/INSTALL
===================================================================
--- trunk/Externals/pcre/INSTALL 2010-06-29 16:44:20 UTC (rev 7209)
+++ trunk/Externals/pcre/INSTALL 2010-06-29 21:11:39 UTC (rev 7210)
@@ -2,10 +2,12 @@
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
- This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+ Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
Basic Installation
==================
@@ -13,7 +15,11 @@
Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package. Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below. The lack of an optional feature in a given package is not
+necessarily a bug. More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -42,7 +48,7 @@
you want to change it or regenerate `configure' using a newer version
of `autoconf'.
-The simplest way to compile this package is:
+ The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system.
@@ -53,12 +59,22 @@
2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with
- the package.
+ the package, generally using the just-built uninstalled binaries.
4. Type `make install' to install the programs and any data files and
- documentation.
+ documentation. When installing into a prefix owned by root, it is
+ recommended that the package be configured and built as a regular
+ user, and only the `make install' phase executed with root
+ privileges.
- 5. You can remove the program binaries and object files from the
+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
+ this time using the binaries in their final installed location.
+ This target does not install anything. Running this target as a
+ regular user, particularly if the prior `make install' required
+ root privileges, verifies that the installation completed
+ correctly.
+
+ 6. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
@@ -67,9 +83,16 @@
all sorts of other programs in order to regenerate files that came
with the distribution.
- 6. Often, you can also type `make uninstall' to remove the installed
- files again.
+ 7. Often, you can also type `make uninstall' to remove the installed
+ files again. In practice, not all packages have tested that
+ uninstallation works correctly, even though it is required by the
+ GNU Coding Standards.
+ 8. Some packages, particularly those that use Automake, provide `make
+ distcheck', which can by used by developers to test that all other
+ targets like `make install' and `make uninstall' work correctly.
+ This target is generally not run by end users.
+
Compilers and Options
=====================
@@ -93,7 +116,8 @@
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'. This
+is known as a "VPATH" build.
With a non-GNU `make', it is safer to compile the package for one
architecture at a time in the source code directory. After you have
@@ -120,7 +144,8 @@
By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
@@ -131,15 +156,46 @@
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them. In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+ The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+ The first method involves providing an override variable for each
+affected directory. For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'. Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated. The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+ The second method involves providing the `DESTDIR' variable. For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names. The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters. On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
+
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-Optional Features
-=================
-
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@@ -152,6 +208,13 @@
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
+ Some packages offer the ability to configure how verbose the
+execution of `make' will be. For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
Particular systems
==================
@@ -159,7 +222,7 @@
CC is not installed, it is recommended to use the following options in
order to use an ANSI C compiler:
- ./configure CC="cc -Ae"
+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
@@ -174,6 +237,16 @@
./configure CC="cc -nodtk"
+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+ On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'. It is recommended to use the following options:
+
+ ./configure --prefix=/boot/common
+
Specifying the System Type
==========================
@@ -189,7 +262,8 @@
where SYSTEM can have one of these forms:
- OS KERNEL-OS
+ OS
+ KERNEL-OS
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
@@ -277,7 +351,7 @@
`configure' can determine that directory automatically.
`--prefix=DIR'
- Use DIR as the installation prefix. *Note Installation Names::
+ Use DIR as the installation prefix. *note Installation Names::
for more details, including other options available for fine-tuning
the installation locations.
Modified: trunk/Externals/pcre/LICENCE
===================================================================
--- trunk/Externals/pcre/LICENCE 2010-06-29 16:44:20 UTC (rev 7209)
+++ trunk/Externals/pcre/LICENCE 2010-06-29 21:11:39 UTC (rev 7210)
@@ -22,7 +22,7 @@
University of Cambridge Computing Service,
Cambridge, England.
-Copyright (c) 1997-2009 University of Cambridge
+Copyright (c) 1997-2010 University of Cambridge
All rights reserved.
@@ -31,7 +31,7 @@
Contributed by: Google Inc.
-Copyright (c) 2007-2008, Google Inc.
+Copyright (c) 2007-2010, Google Inc.
All rights reserved.
Modified: trunk/Externals/pcre/Makefile.am
===================================================================
--- trunk/Externals/pcre/Makefile.am 2010-06-29 16:44:20 UTC (rev 7209)
+++ trunk/Externals/pcre/Makefile.am 2010-06-29 21:11:39 UTC (rev 7210)
@@ -1,5 +1,7 @@
## Process this file with automake to produce Makefile.in.
+ACLOCAL_AMFLAGS = -I m4
+
dist_doc_DATA = \
doc/pcre.txt \
doc/pcre-config.txt \
Modified: trunk/Externals/pcre/Makefile.in
===================================================================
--- trunk/Externals/pcre/Makefile.in 2010-06-29 16:44:20 UTC (rev 7209)
+++ trunk/Externals/pcre/Makefile.in 2010-06-29 21:11:39 UTC (rev 7210)
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -287,6 +288,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PCRE_DATE = @PCRE_DATE@
@@ -323,6 +325,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+enable_cpp = @enable_cpp@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
@@ -357,6 +360,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+ACLOCAL_AMFLAGS = -I m4
dist_doc_DATA = \
doc/pcre.txt \
doc/pcre-config.txt \
@@ -1170,6 +1174,19 @@
else :; fi
distdir: $(DISTFILES)
+ @list='$(MANS)'; if test -n "$$list"; then \
+ list=`for p in $$list; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
+ if test -n "$$list" && \
+ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
+ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
+ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
+ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
+ echo " typically \`make maintainer-clean' will remove them" >&2; \
+ exit 1; \
+ else :; fi; \
+ else :; fi
$(am__remove_distdir)
test -d $(distdir) || mkdir $(distdir)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -1197,7 +1214,8 @@
|| exit 1; \
fi; \
done
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ -find "$(distdir)" -type d ! -perm -755 \
+ -exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -1357,6 +1375,8 @@
html: html-am
+html-am:
+
info: info-am
info-am:
@@ -1367,19 +1387,29 @@
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am: install-binPROGRAMS install-binSCRIPTS \
install-libLTLIBRARIES
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man: install-man1 install-man3
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
Modified: trunk/Externals/pcre/NEWS
===================================================================
--- trunk/Externals/pcre/NEWS 2010-06-29 16:44:20 UTC (rev 7209)
+++ trunk/Externals/pcre/NEWS 2010-06-29 21:11:39 UTC (rev 7210)
@@ -1,6 +1,30 @@
News about PCRE releases
------------------------
+Release 8.10 25-Jun-2010
+------------------------
+
+There are two major additions: support for (*MARK) and friends, and the option
+PCRE_UCP, which changes the behaviour of \b, \d, \s, and \w (and their
+opposites) so that they make use of Unicode properties. There are also a number
+of lesser new features, and several bugs have been fixed. A new option,
+--line-buffered, has been added to pcregrep, for use when it is connected to
+pipes.
+
+
+Release 8.02 19-Mar-2010
+------------------------
+
+Another bug-fix release.
+
+
+Release 8.01 19-Jan-2010
+------------------------
+
+This is a bug-fix release. Several bugs in the code itself and some bugs and
+infelicities in the build system have been fixed.
+
+
Release 8.00 19-Oct-09
----------------------
Modified: trunk/Externals/pcre/NON-UNIX-USE
===================================================================
--- trunk/Externals/pcre/NON-UNIX-USE 2010-06-29 16:44:20 UTC (rev 7209)
+++ trunk/Externals/pcre/NON-UNIX-USE 2010-06-29 21:11:39 UTC (rev 7210)
@@ -127,12 +127,16 @@
your system has static and shared libraries, you may have to do this once
for each type.
- (8) Similarly, compile pcreposix.c (remembering -DHAVE_CONFIG_H if necessary)
- and link the result (on its own) as the pcreposix library.
+ (8) Similarly, if you want to build the POSIX wrapper functions, ensure that
+ you have the pcreposix.h file and then compile pcreposix.c (remembering
+ -DHAVE_CONFIG_H if necessary). Link the result (on its own) as the
+ pcreposix library.
(9) Compile the test program pcretest.c (again, don't forget -DHAVE_CONFIG_H).
- This needs the functions in the pcre and pcreposix libraries when linking.
- It also needs the pcre_printint.src source file, which it #includes.
+ This needs the functions in the PCRE library when linking. It also needs
+ the pcreposix wrapper functions unless you compile it with -DNOPOSIX. The
+ pcretest.c program also needs the pcre_printint.src source file, which it
+ #includes.
(10) Run pcretest on the testinput files in the testdata directory, and check
that the output matches the corresponding testoutput files. Note that the
@@ -184,9 +188,9 @@
LINKING PROGRAMS IN WINDOWS ENVIRONMENTS
If you want to statically link a program against a PCRE library in the form of
-a non-dll .a file, you must define PCRE_STATIC before including pcre.h,
-otherwise the pcre_malloc() and pcre_free() exported functions will be declared
-__declspec(dllimport), with unwanted results.
+a non-dll .a file, you must define PCRE_STATIC before including pcre.h or
+pcrecpp.h, otherwise the pcre_malloc() and pcre_free() exported functions will
+be declared __declspec(dllimport), with unwanted results.
CALLING CONVENTIONS IN WINDOWS ENVIRONMENTS
@@ -273,8 +277,7 @@
The test files that are supplied with PCRE are in Unix format, with LF
characters as line terminators. It may be necessary to change the line
-terminators in order to get some of the tests to work. We hope to improve
-things in this area in future.
+terminators in order to get some of the tests to work.
BUILDING PCRE ON WINDOWS WITH CMAKE
@@ -494,5 +497,5 @@
=========================
-Last Updated: 05 October 2009
+Last Updated: 26 May 2010
****
Modified: trunk/Externals/pcre/README
===================================================================
--- trunk/Externals/pcre/README 2010-06-29 16:44:20 UTC (rev 7209)
+++ trunk/Externals/pcre/README 2010-06-29 21:11:39 UTC (rev 7210)
@@ -311,10 +311,10 @@
. RunTest is a script for running tests on the basic C library
. RunGrepTest is a script for running tests on the pcregrep command
-Versions of config.h and pcre.h are distributed in the PCRE tarballs under
-the names config.h.generic and pcre.h.generic. These are provided for the
-benefit of those who have to built PCRE without the benefit of "configure". If
-you use "configure", the .generic versions are not used.
+Versions of config.h and pcre.h are distributed in the PCRE tarballs under the
+names config.h.generic and pcre.h.generic. These are provided for those who
+have to built PCRE without using "configure" or CMake. If you use "configure"
+or CMake, the .generic versions are not used.
If a C++ compiler is found, the following files are also built:
@@ -796,4 +796,4 @@
Philip Hazel
Email local part: ph10
Email domain: cam.ac.uk
-Last updated: 19 October 2009
+Last updated: 19 January 2010
Modified: trunk/Externals/pcre/RunTest
===================================================================
--- trunk/Externals/pcre/RunTest 2010-06-29 16:44:20 UTC (rev 7209)
+++ trunk/Externals/pcre/RunTest 2010-06-29 21:11:39 UTC (rev 7210)
@@ -133,10 +133,10 @@
echo PCRE C library tests
./pcretest /dev/null
-# Primary test, Perl-compatible for both 5.8 and 5.10
+# Primary test, compatible with Perl 5.8, 5.10, 5.11
if [ $do1 = yes ] ; then
- echo "Test 1: main functionality (Perl 5.8 & 5.10 compatible)"
+ echo "Test 1: main functionality (Perl 5.8, 5.10, 5.11 compatible)"
$valgrind ./pcretest -q $testdata/testinput1 testtry
if [ $? = 0 ] ; then
$cf $testdata/testoutput1 testtry
@@ -215,7 +215,7 @@
# Additional tests for UTF8 support
if [ $do4 = yes ] ; then
- echo "Test 4: UTF-8 support (Perl 5.8 & 5.10 compatible)"
+ echo "Test 4: UTF-8 support (Perl 5.8, 5.10, 5.11 compatible)"
$valgrind ./pcretest -q $testdata/testinput4 testtry
if [ $? = 0 ] ; then
$cf $testdata/testoutput4 testtry
@@ -237,7 +237,7 @@
fi
if [ $do6 = yes ] ; then
- echo "Test 6: Unicode property support (Perl 5.10 compatible)"
+ echo "Test 6: Unicode property support (Perl 5.10, 5.11 compatible)"
$valgrind ./pcretest -q $testdata/testinput6 testtry
if [ $? = 0 ] ; then
$cf $testdata/testoutput6 testtry
@@ -299,10 +299,10 @@
echo "OK"
fi
-# Test of Perl 5.10 features
+# Test of Perl 5.10, 5.11 features
if [ $do11 = yes ] ; then
- echo "Test 11: Perl 5.10 features"
+ echo "Test 11: Perl 5.10, 5.11 features"
$valgrind ./pcretest -q $testdata/testinput11 testtry
if [ $? = 0 ] ; then
$cf $testdata/testoutput11 testtry
Modified: trunk/Externals/pcre/Win32/pcre.h
===================================================================
--- trunk/Externals/pcre/Win32/pcre.h 2010-06-29 16:44:20 UTC (rev 7209)
+++ trunk/Externals/pcre/Win32/pcre.h 2010-06-29 21:11:39 UTC (rev 7210)
@@ -5,7 +5,7 @@
/* This is the public header file for the PCRE library, to be #included by
applications that call the PCRE functions.
- Copyright (c) 1997-2009 University of Cambridge
+ Copyright (c) 1997-2010 University of Cambridge
-----------------------------------------------------------------------------
Redistribution and use in source and binary forms, with or without
@@ -42,9 +42,9 @@
/* The current PCRE version information. */
#define PCRE_MAJOR 8
-#define PCRE_MINOR 00
+#define PCRE_MINOR 10
#define PCRE_PRERELEASE
-#define PCRE_DATE 2009-10-19
+#define PCRE_DATE 2010-06-25
/* When an application links to a PCRE DLL in Windows, the symbols that are
imported have to be identified as such. When building PCRE, the appropriate
@@ -131,6 +131,7 @@
#define PCRE_NO_START_OPTIMISE 0x04000000
#define PCRE_PARTIAL_HARD 0x08000000
#define PCRE_NOTEMPTY_ATSTART 0x10000000
+#define PCRE_UCP 0x20000000
/* Exec-time and get/set-time error codes */
@@ -200,6 +201,7 @@
#define PCRE_EXTRA_CALLOUT_DATA 0x0004
#define PCRE_EXTRA_TABLES 0x0008
#define PCRE_EXTRA_MATCH_LIMIT_RECURSION 0x0010
+#define PCRE_EXTRA_MARK 0x0020
/* Types */
@@ -225,6 +227,7 @@
void *callout_data; /* Data passed back in callouts */
const unsigned char *tables; /* Pointer to character tables */
unsigned long int match_limit_recursion; /* Max recursive calls to match() */
+ unsigned char **mark; /* For passing back a mark pointer */
} pcre_extra;
/* The structure for passing out data via the pcre_callout_function. We use a
Modified: trunk/Externals/pcre/Win32/pcre_chartables.c
===================================================================
--- trunk/Externals/pcre/Win32/pcre_chartables.c 2010-06-29 16:44:20 UTC (rev 7209)
+++ trunk/Externals/pcre/Win32/pcre_chartables.c 2010-06-29 21:11:39 UTC (rev 7210)
@@ -14,7 +14,7 @@
current locale. If PCRE is configured with --enable-rebuild-chartables, this
happens automatically.
-The following #includes are present because without the gcc 4.x may remove the
+The following #includes are present because without them gcc 4.x may remove the
array definition from the final binary if PCRE is built into a static library
and dead code stripping is activated. This leads to link errors. Pulling in the
header ensures that the array gets flagged as "someone outside this compilation
Modified: trunk/Externals/pcre/Win64/pcre.h
===================================================================
--- trunk/Externals/pcre/Win64/pcre.h 2010-06-29 16:44:20 UTC (rev 7209)
+++ trunk/Externals/pcre/Win64/pcre.h 2010-06-29 21:11:39 UTC (rev 7210)
@@ -5,7 +5,7 @@
/* This is the public header file for the PCRE library, to be #included by
applications that call the PCRE functions.
- Copyright (c) 1997-2009 University of Cambridge
+ Copyright (c) 1997-2010 University of Cambridge
-----------------------------------------------------------------------------
Redistribution and use in source and binary forms, with or without
@@ -42,9 +42,9 @@
/* The current PCRE version information. */
#define PCRE_MAJOR 8
-#define PCRE_MINOR 00
+#define PCRE_MINOR 10
#define PCRE_PRERELEASE
-#define PCRE_DATE 2009-10-19
+#define PCRE_DATE 2010-06-25
/* When an application links to a PCRE DLL in Windows, the symbols that are
imported have to be identified as such. When building PCRE, the appropriate
@@ -131,6 +131,7 @@
#define PCRE_NO_START_OPTIMISE 0x04000000
#define PCRE_PARTIAL_HARD 0x08000000
#define PCRE_NOTEMPTY_ATSTART 0x10000000
+#define PCRE_UCP 0x20000000
/* Exec-time and get/set-time error codes */
@@ -200,6 +201,7 @@
#define PCRE_EXTRA_CALLOUT_DATA 0x0004
#define PCRE_EXTRA_TABLES 0x0008
#define PCRE_EXTRA_MATCH_LIMIT_RECURSION 0x0010
+#define PCRE_EXTRA_MARK 0x0020
/* Types */
@@ -225,6 +227,7 @@
void *callout_data; /* Data passed back in callouts */
const unsigned char *tables; /* Pointer to character tables */
unsigned long int match_limit_recursion; /* Max recursive calls to match() */
+ unsigned char **mark; /* For passing back a mark pointer */
} pcre_extra;
/* The structure for passing out data via the pcre_callout_function. We use a
Modified: trunk/Externals/pcre/Win64/pcre_chartables.c
===================================================================
--- trunk/Externals/pcre/Win64/pcre_chartables.c 2010-06-29 16:44:20 UTC (rev 7209)
+++ trunk/Externals/pcre/Win64/pcre_chartables.c 2010-06-29 21:11:39 UTC (rev 7210)
@@ -14,7 +14,7 @@
current locale. If PCRE is configured with --enable-rebuild-chartables, this
happens automatically.
-The following #includes are present because without the gcc 4.x may remove the
+The following #includes are present because without them gcc 4.x may remove the
array definition from the final binary if PCRE is built into a static library
and dead code stripping is activated. This leads to link errors. Pulling in the
header ensures that the array gets flagged as "someone outside this compilation
Modified: trunk/Externals/pcre/aclocal.m4
===================================================================
--- trunk/Externals/pcre/aclocal.m4 2010-06-29 16:44:20 UTC (rev 7209)
+++ trunk/Externals/pcre/aclocal.m4 2010-06-29 21:11:39 UTC (rev 7210)
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.3 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
-[m4_warning([this file was generated for autoconf 2.63.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -7872,15 +7872,15 @@
# Generated from ltversion.in.
-# serial 3012 ltversion.m4
+# serial 3017 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.2.6])
-m4_define([LT_PACKAGE_REVISION], [1.3012])
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
+m4_define([LT_PACKAGE_REVISION], [1.3017])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6'
-macro_revision='1.3012'
+[macro_version='2.2.6b'
+macro_revision='1.3017'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
@@ -7993,7 +7993,7 @@
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10.2], [],
+m4_if([$1], [1.10.3], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -8009,7 +8009,7 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.2])dnl
+[AM_AUTOMAKE_VERSION([1.10.3])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -8102,14 +8102,14 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 9
+# serial 10
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -8166,6 +8166,16 @@
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
fi
+ am__universal=false
+ m4_case([$1], [CC],
+ [case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac],
+ [CXX],
+ [case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac])
+
for depmode in $am_compiler_list; do
# Setup a source with many dependencies, because some compilers
# like to wrap large dependency lists on column 80 (with \), and
@@ -8183,7 +8193,17 @@
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
@@ -8193,19 +8213,23 @@
break
fi
;;
+ msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
none) break ;;
esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ source=sub/conftest.c object=$am__obj \
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
>/dev/null 2>conftest.err &&
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
@@ -8269,59 +8293,61 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-#serial 4
+#serial 5
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[# Autoconf 2.62 quotes --file arguments for eval, but not when files
-# are listed without --file. Let's play safe and only enable the eval
-# if we detect the quoting.
-case $CONFIG_FILES in
-*\'*) eval set x "$CONFIG_FILES" ;;
-*) set x $CONFIG_FILES ;;
-esac
-shift
-for mf
-do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
+[{
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # are listed without --file. Let's play safe and only enable the eval
+ # if we detect the quoting.
+ case $CONFIG_FILES in
+ *\'*) eval set x "$CONFIG_FILES" ;;
+ *) set x $CONFIG_FILES ;;
+ esac
+ shift
+ for mf
+ do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`AS_DIRNAME("$mf")`
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`AS_DIRNAME(["$file"])`
+ AS_MKDIR_P([$dirpart/$fdir])
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
done
-done
+}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@@ -8341,7 +8367,7 @@
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008 Free Software Foundation, Inc.
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -8415,8 +8441,8 @@
AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
AM_MISSING_PROG(AUTOHEADER, autoheader)
AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
AC_REQUIRE([AM_PROG_MKDIR_P])dnl
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
Modified: trunk/Externals/pcre/config.guess
===================================================================
--- trunk/Externals/pcre/config.guess 2010-06-29 16:44:20 UTC (rev 7209)
+++ trunk/Externals/pcre/config.guess 2010-06-29 21:11:39 UTC (rev 7210)
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
# Free Software Foundation, Inc.
-timestamp='2009-02-03'
+timestamp='2009-12-30'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@
# the same distribution terms that you use for the rest of that program.
-# Originally written by Per Bothner <pe...@bo...>.
-# Please send patches to <con...@gn...>. Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner. Please send patches (context
+# diff format) to <con...@gn...> ...
[truncated message content] |
|
From: <ge...@us...> - 2010-06-29 16:44:26
|
Revision: 7209
http://winmerge.svn.sourceforge.net/winmerge/?rev=7209&view=rev
Author: gerundt
Date: 2010-06-29 16:44:20 +0000 (Tue, 29 Jun 2010)
Log Message:
-----------
Fix post build event for "X64 Debug" and "X64 Release" in pcreX64.vcproj
Modified Paths:
--------------
trunk/Externals/pcre/Win32/pcreX64.vcproj
Modified: trunk/Externals/pcre/Win32/pcreX64.vcproj
===================================================================
--- trunk/Externals/pcre/Win32/pcreX64.vcproj 2010-06-28 14:30:33 UTC (rev 7208)
+++ trunk/Externals/pcre/Win32/pcreX64.vcproj 2010-06-29 16:44:20 UTC (rev 7209)
@@ -1007,7 +1007,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine=""
+ CommandLine="mkdir ..\..\..\Build\pcre\X64
copy "$(OutDir)\pcre.dll" ..\..\..\Build\pcre\X64
copy "$(OutDir)\pcre.lib" ..\..\..\Build\pcre\X64
"
/>
</Configuration>
<Configuration
@@ -1202,7 +1202,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="mkdir ..\..\..\Build\pcre\$(PlatformName)
copy $(OutDir)\pcre.dll ..\..\..\Build\pcre\$(PlatformName)
copy $(OutDir)\pcre.lib ..\..\..\Build\pcre\$(PlatformName)
"
+ CommandLine="mkdir ..\..\..\Build\pcre\X64
copy "$(OutDir)\pcre.dll" ..\..\..\Build\pcre\X64
copy "$(OutDir)\pcre.lib" ..\..\..\Build\pcre\X64
"
/>
</Configuration>
</Configurations>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-06-28 14:30:44
|
Revision: 7208
http://winmerge.svn.sourceforge.net/winmerge/?rev=7208&view=rev
Author: gerundt
Date: 2010-06-28 14:30:33 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Fix post build event for "X64 Debug" and "X64 Release" in expatX64.vcproj
Modified Paths:
--------------
trunk/Externals/expat/lib/expatX64.vcproj
Modified: trunk/Externals/expat/lib/expatX64.vcproj
===================================================================
--- trunk/Externals/expat/lib/expatX64.vcproj 2010-06-28 10:58:17 UTC (rev 7207)
+++ trunk/Externals/expat/lib/expatX64.vcproj 2010-06-28 14:30:33 UTC (rev 7208)
@@ -559,7 +559,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine=""
+ CommandLine="mkdir ..\..\..\Build\expat\X64
copy ..\..\..\Build\expat\lib\X64\Debug\libexpat.lib ..\..\..\Build\expat\X64\
copy ..\..\..\Build\expat\lib\X64\Debug\libexpat.dll ..\..\..\Build\expat\X64\
"
/>
</Configuration>
<Configuration
@@ -739,7 +739,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="mkdir ..\..\..\Build\expat\$(PlatformName)
copy ..\..\..\Build\expat\lib\$(PlatformName)\$(ConfigurationName)\libexpat.lib ..\..\..\Build\expat\$(PlatformName)\
copy ..\..\..\Build\expat\lib\$(PlatformName)\$(ConfigurationName)\libexpat.dll ..\..\..\Build\expat\$(PlatformName)\
"
+ CommandLine="mkdir ..\..\..\Build\expat\X64
copy ..\..\..\Build\expat\lib\X64\Release\libexpat.lib ..\..\..\Build\expat\X64\
copy ..\..\..\Build\expat\lib\X64\Release\libexpat.dll ..\..\..\Build\expat\X64\
"
/>
</Configuration>
</Configurations>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-06-28 10:58:23
|
Revision: 7207
http://winmerge.svn.sourceforge.net/winmerge/?rev=7207&view=rev
Author: gerundt
Date: 2010-06-28 10:58:17 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Fix translation paths in MergeLangX64.vcproj
Modified Paths:
--------------
trunk/Src/MergeLangX64.vcproj
Modified: trunk/Src/MergeLangX64.vcproj
===================================================================
--- trunk/Src/MergeLangX64.vcproj 2010-06-19 13:51:51 UTC (rev 7206)
+++ trunk/Src/MergeLangX64.vcproj 2010-06-28 10:58:17 UTC (rev 7207)
@@ -97,7 +97,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)..\Translations\WinMerge
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -179,7 +179,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)..\Translations\WinMerge
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -258,7 +258,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)..\Translations\WinMerge
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -338,7 +338,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)..\Translations\WinMerge
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -419,7 +419,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)..\Translations\WinMerge
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -501,7 +501,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)..\Translations\WinMerge
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -580,7 +580,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)..\Translations\WinMerge
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -660,7 +660,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)..\Translations\WinMerge
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -741,7 +741,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)..\Translations\WinMerge
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -823,7 +823,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)..\Translations\WinMerge
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -902,7 +902,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)..\Translations\WinMerge
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -982,7 +982,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)..\Translations\WinMerge
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)..\Translations\WinMerge\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
</Configurations>
@@ -998,7 +998,7 @@
<Tool
Name="VCCustomBuildTool"
CommandLine="cd ..\Translations\WinMerge
cscript CreateMasterPotFile.vbs
"
- Outputs="Languages\MergeLang.rc"
+ Outputs="..\Translations\WinMerge\MergeLang.rc"
/>
</FileConfiguration>
<FileConfiguration
@@ -1007,7 +1007,7 @@
<Tool
Name="VCCustomBuildTool"
CommandLine="cd ..\Translations\WinMerge
cscript CreateMasterPotFile.vbs
"
- Outputs="Languages\MergeLang.rc"
+ Outputs="..\Translations\WinMerge\MergeLang.rc"
/>
</FileConfiguration>
<FileConfiguration
@@ -1016,7 +1016,7 @@
<Tool
Name="VCCustomBuildTool"
CommandLine="cd ..\Translations\WinMerge
cscript CreateMasterPotFile.vbs
"
- Outputs="Languages\MergeLang.rc"
+ Outputs="..\Translations\WinMerge\MergeLang.rc"
/>
</FileConfiguration>
<FileConfiguration
@@ -1025,7 +1025,7 @@
<Tool
Name="VCCustomBuildTool"
CommandLine="cd ..\Translations\WinMerge
cscript CreateMasterPotFile.vbs
"
- Outputs="Languages\MergeLang.rc"
+ Outputs="..\Translations\WinMerge\MergeLang.rc"
/>
</FileConfiguration>
<FileConfiguration
@@ -1034,7 +1034,7 @@
<Tool
Name="VCCustomBuildTool"
CommandLine="cd ..\Translations\WinMerge
cscript CreateMasterPotFile.vbs
"
- Outputs="Languages\MergeLang.rc"
+ Outputs="..\Translations\WinMerge\MergeLang.rc"
/>
</FileConfiguration>
<FileConfiguration
@@ -1043,7 +1043,7 @@
<Tool
Name="VCCustomBuildTool"
CommandLine="cd ..\Translations\WinMerge
cscript CreateMasterPotFile.vbs
"
- Outputs="Languages\MergeLang.rc"
+ Outputs="..\Translations\WinMerge\MergeLang.rc"
/>
</FileConfiguration>
<FileConfiguration
@@ -1052,7 +1052,7 @@
<Tool
Name="VCCustomBuildTool"
CommandLine="cd ..\Translations\WinMerge
cscript CreateMasterPotFile.vbs
"
- Outputs="Languages\MergeLang.rc"
+ Outputs="..\Translations\WinMerge\MergeLang.rc"
/>
</FileConfiguration>
<FileConfiguration
@@ -1061,7 +1061,7 @@
<Tool
Name="VCCustomBuildTool"
CommandLine="cd ..\Translations\WinMerge
cscript CreateMasterPotFile.vbs
"
- Outputs="Languages\MergeLang.rc"
+ Outputs="..\Translations\WinMerge\MergeLang.rc"
/>
</FileConfiguration>
<FileConfiguration
@@ -1070,7 +1070,7 @@
<Tool
Name="VCCustomBuildTool"
CommandLine="cd ..\Translations\WinMerge
cscript CreateMasterPotFile.vbs
"
- Outputs="Languages\MergeLang.rc"
+ Outputs="..\Translations\WinMerge\MergeLang.rc"
/>
</FileConfiguration>
<FileConfiguration
@@ -1079,7 +1079,7 @@
<Tool
Name="VCCustomBuildTool"
CommandLine="cd ..\Translations\WinMerge
cscript CreateMasterPotFile.vbs
"
- Outputs="Languages\MergeLang.rc"
+ Outputs="..\Translations\WinMerge\MergeLang.rc"
/>
</FileConfiguration>
<FileConfiguration
@@ -1088,7 +1088,7 @@
<Tool
Name="VCCustomBuildTool"
CommandLine="cd ..\Translations\WinMerge
cscript CreateMasterPotFile.vbs
"
- Outputs="Languages\MergeLang.rc"
+ Outputs="..\Translations\WinMerge\MergeLang.rc"
/>
</FileConfiguration>
<FileConfiguration
@@ -1097,12 +1097,12 @@
<Tool
Name="VCCustomBuildTool"
CommandLine="cd ..\Translations\WinMerge
cscript CreateMasterPotFile.vbs
"
- Outputs="Languages\MergeLang.rc"
+ Outputs="..\Translations\WinMerge\MergeLang.rc"
/>
</FileConfiguration>
</File>
<File
- RelativePath=".\Languages\MergeLang.rc"
+ RelativePath="..\Translations\WinMerge\MergeLang.rc"
>
</File>
</Files>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-06-19 13:51:58
|
Revision: 7206
http://winmerge.svn.sourceforge.net/winmerge/?rev=7206&view=rev
Author: kimmov
Date: 2010-06-19 13:51:51 +0000 (Sat, 19 Jun 2010)
Log Message:
-----------
Fix InnoSetup installer file by adding missing semicolon.
Modified Paths:
--------------
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2010-06-19 13:02:44 UTC (rev 7205)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2010-06-19 13:51:51 UTC (rev 7206)
@@ -139,7 +139,7 @@
Name: PortugueseBrazilian; MessagesFile: ..\..\Translations\InnoSetup\Brazilian_Portuguese.isl; InfoAfterFile: ..\..\Translations\Docs\Readme\ReadMe-Brazilian.txt
Name: Romanian; MessagesFile: ..\..\Translations\InnoSetup\Romanian.isl
Name: Russian; MessagesFile: ..\..\Translations\InnoSetup\Russian.isl
-Name: Serbian; MessagesFile: ..\..\Translations\InnoSetup\Serbian.isl InfoAfterFile: ..\..\Translations\Docs\Readme\ReadMe-Serbian.txt
+Name: Serbian; MessagesFile: ..\..\Translations\InnoSetup\Serbian.isl; InfoAfterFile: ..\..\Translations\Docs\Readme\ReadMe-Serbian.txt
Name: Slovak; MessagesFile: ..\..\Translations\InnoSetup\Slovak.isl
Name: Slovenian; MessagesFile: ..\..\Translations\InnoSetup\Slovenian.isl
Name: Spanish; MessagesFile: ..\..\Translations\InnoSetup\Spanish.isl; InfoAfterFile: ..\..\Translations\Docs\Readme\ReadMe-Spanish.txt
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-06-19 13:02:50
|
Revision: 7205
http://winmerge.svn.sourceforge.net/winmerge/?rev=7205&view=rev
Author: kimmov
Date: 2010-06-19 13:02:44 +0000 (Sat, 19 Jun 2010)
Log Message:
-----------
WinMerge experimental release 2.13.13. (SVN r7205)
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-06-19 13:00:23 UTC (rev 7204)
+++ trunk/Docs/Users/ChangeLog.txt 2010-06-19 13:02:44 UTC (rev 7205)
@@ -3,7 +3,7 @@
to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL:
http://winmerge.org/tracker/[tracker-id]
-WinMerge 2.13.13
+WinMerge 2.13.13 - 2010-06-19 (r7205)
Improve editing of linefilter regular expressions (#3015416)
Installer: Embed MS runtime files installer for x64 (r7150)
Installer: Set default language with MSI setup (#3014912)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-06-19 13:00:29
|
Revision: 7204
http://winmerge.svn.sourceforge.net/winmerge/?rev=7204&view=rev
Author: kimmov
Date: 2010-06-19 13:00:23 +0000 (Sat, 19 Jun 2010)
Log Message:
-----------
Fix typo in release script.
Modified Paths:
--------------
trunk/Tools/Scripts/create_release.py
Modified: trunk/Tools/Scripts/create_release.py
===================================================================
--- trunk/Tools/Scripts/create_release.py 2010-06-19 12:52:04 UTC (rev 7203)
+++ trunk/Tools/Scripts/create_release.py 2010-06-19 13:00:23 UTC (rev 7204)
@@ -81,7 +81,7 @@
import os
import os.path
import sys
-simport optparse
+import optparse
import shutil
import SetVersions
import ToolSettings
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-06-19 12:52:12
|
Revision: 7203
http://winmerge.svn.sourceforge.net/winmerge/?rev=7203&view=rev
Author: kimmov
Date: 2010-06-19 12:52:04 +0000 (Sat, 19 Jun 2010)
Log Message:
-----------
Bump WinMerge version to 2.13.13 and Shellextension version to 1.16.3.
Modified Paths:
--------------
trunk/versions.ini
Modified: trunk/versions.ini
===================================================================
--- trunk/versions.ini 2010-06-19 12:46:49 UTC (rev 7202)
+++ trunk/versions.ini 2010-06-19 12:52:04 UTC (rev 7203)
@@ -7,19 +7,19 @@
description = WinMerge InnoSetup installer
path = Installer/InnoSetup/WinMerge.iss
macro = AppVersion
-version = "2.13.12"
+version = "2.13.13"
[Executable]
type = WinRC
description = WinMerge executable
path = Src/Merge.rc
-version = "2.13.12"
+version = "2.13.13"
[Dll]
type = WinRC
description = ShellExtension
path = ShellExtension/ShellExtension.rc
-version = "1.16.2"
+version = "1.16.3"
[Manual]
type = Docbook
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-06-19 12:46:56
|
Revision: 7202
http://winmerge.svn.sourceforge.net/winmerge/?rev=7202&view=rev
Author: kimmov
Date: 2010-06-19 12:46:49 +0000 (Sat, 19 Jun 2010)
Log Message:
-----------
Translations: Update WinMerge POT and PO files.
Modified Paths:
--------------
trunk/Translations/WinMerge/Brazilian.po
trunk/Translations/WinMerge/Bulgarian.po
trunk/Translations/WinMerge/Catalan.po
trunk/Translations/WinMerge/ChineseSimplified.po
trunk/Translations/WinMerge/ChineseTraditional.po
trunk/Translations/WinMerge/Croatian.po
trunk/Translations/WinMerge/Czech.po
trunk/Translations/WinMerge/Danish.po
trunk/Translations/WinMerge/Dutch.po
trunk/Translations/WinMerge/English.pot
trunk/Translations/WinMerge/French.po
trunk/Translations/WinMerge/Galician.po
trunk/Translations/WinMerge/German.po
trunk/Translations/WinMerge/Greek.po
trunk/Translations/WinMerge/Hungarian.po
trunk/Translations/WinMerge/Italian.po
trunk/Translations/WinMerge/Japanese.po
trunk/Translations/WinMerge/Korean.po
trunk/Translations/WinMerge/Norwegian.po
trunk/Translations/WinMerge/Persian.po
trunk/Translations/WinMerge/Polish.po
trunk/Translations/WinMerge/Portuguese.po
trunk/Translations/WinMerge/Romanian.po
trunk/Translations/WinMerge/Russian.po
trunk/Translations/WinMerge/Serbian.po
trunk/Translations/WinMerge/Slovak.po
trunk/Translations/WinMerge/Slovenian.po
trunk/Translations/WinMerge/Spanish.po
trunk/Translations/WinMerge/Swedish.po
trunk/Translations/WinMerge/Turkish.po
trunk/Translations/WinMerge/Ukrainian.po
Modified: trunk/Translations/WinMerge/Brazilian.po
===================================================================
--- trunk/Translations/WinMerge/Brazilian.po 2010-06-19 12:41:51 UTC (rev 7201)
+++ trunk/Translations/WinMerge/Brazilian.po 2010-06-19 12:46:49 UTC (rev 7202)
@@ -401,7 +401,7 @@
#: Merge.rc:178
#: Merge.rc:299
#: Merge.rc:487
-#: Merge.rc:1948
+#: Merge.rc:1945
#, c-format
msgid "&Help"
msgstr "&Ajuda"
@@ -732,7 +732,7 @@
msgstr "&Scripts"
#: Merge.rc:373
-#: Merge.rc:2708
+#: Merge.rc:2705
#, c-format
msgid "< Empty >"
msgstr "< Vazio >"
@@ -934,15 +934,15 @@
msgstr "&Apagar"
#: Merge.rc:526
-#: Merge.rc:1147
-#: Merge.rc:1514
+#: Merge.rc:1144
+#: Merge.rc:1511
#, c-format
msgid "&Left"
msgstr "&Esquerda"
#: Merge.rc:527
-#: Merge.rc:1149
-#: Merge.rc:1517
+#: Merge.rc:1146
+#: Merge.rc:1514
#, c-format
msgid "&Right"
msgstr "&Direita"
@@ -1095,16 +1095,16 @@
#: Merge.rc:679
#: Merge.rc:711
#: Merge.rc:803
-#: Merge.rc:995
-#: Merge.rc:1066
-#: Merge.rc:1095
-#: Merge.rc:1105
-#: Merge.rc:1256
-#: Merge.rc:1320
-#: Merge.rc:1333
-#: Merge.rc:1425
-#: Merge.rc:1440
-#: Merge.rc:1662
+#: Merge.rc:992
+#: Merge.rc:1063
+#: Merge.rc:1092
+#: Merge.rc:1102
+#: Merge.rc:1253
+#: Merge.rc:1317
+#: Merge.rc:1330
+#: Merge.rc:1422
+#: Merge.rc:1437
+#: Merge.rc:1659
#, c-format
msgid "OK"
msgstr "OK"
@@ -1120,39 +1120,39 @@
msgstr "Selecionar Arquivos ou Pastas"
#: Merge.rc:690
-#: Merge.rc:1591
+#: Merge.rc:1588
#, c-format
msgid "&Left:"
msgstr "&Esquerda:"
#: Merge.rc:694
#: Merge.rc:755
-#: Merge.rc:1009
-#: Merge.rc:1031
+#: Merge.rc:1006
+#: Merge.rc:1028
#, c-format
msgid "&Browse..."
msgstr "&Procurar..."
#: Merge.rc:695
-#: Merge.rc:1595
+#: Merge.rc:1592
#, c-format
msgid "&Right:"
msgstr "&Direita:"
#: Merge.rc:699
-#: Merge.rc:1042
+#: Merge.rc:1039
#, c-format
msgid "Bro&wse..."
msgstr "Pro&curar..."
#: Merge.rc:700
-#: Merge.rc:1599
+#: Merge.rc:1596
#, c-format
msgid "&Filter:"
msgstr "&Filtro:"
#: Merge.rc:703
-#: Merge.rc:1601
+#: Merge.rc:1598
#, c-format
msgid "Select..."
msgstr "Selecionar..."
@@ -1168,7 +1168,7 @@
msgstr "&Selecionar..."
#: Merge.rc:708
-#: Merge.rc:1602
+#: Merge.rc:1599
#, c-format
msgid "&Include Subfolders"
msgstr "&Incluir as Sub-pastas"
@@ -1184,21 +1184,21 @@
#: Merge.rc:834
#: Merge.rc:866
#: Merge.rc:876
-#: Merge.rc:1067
-#: Merge.rc:1096
-#: Merge.rc:1106
-#: Merge.rc:1157
-#: Merge.rc:1257
-#: Merge.rc:1334
-#: Merge.rc:1426
-#: Merge.rc:1441
-#: Merge.rc:1663
+#: Merge.rc:1064
+#: Merge.rc:1093
+#: Merge.rc:1103
+#: Merge.rc:1154
+#: Merge.rc:1254
+#: Merge.rc:1331
+#: Merge.rc:1423
+#: Merge.rc:1438
+#: Merge.rc:1660
#, c-format
msgid "Cancel"
msgstr "Cancelar"
#: Merge.rc:713
-#: Merge.rc:1335
+#: Merge.rc:1332
#, c-format
msgid "Help"
msgstr "Ajuda"
@@ -1266,14 +1266,14 @@
msgstr "&Sistema de Vers\xF5es:"
#: Merge.rc:753
-#: Merge.rc:2083
+#: Merge.rc:2080
#, c-format
msgid "&Path to cleartool.exe:"
msgstr "&Caminho para o cleartool.exe:"
#: Merge.rc:760
-#: Merge.rc:1956
-#: Merge.rc:1969
+#: Merge.rc:1953
+#: Merge.rc:1966
#, c-format
msgid "General"
msgstr "Geral"
@@ -1329,13 +1329,13 @@
msgstr "Ativar m\xFAltiplas janelas de compara\xE7\xE3o para"
#: Merge.rc:787
-#: Merge.rc:1614
+#: Merge.rc:1611
#, c-format
msgid "&Folder compare"
msgstr "&Comparar as pastas"
#: Merge.rc:789
-#: Merge.rc:1616
+#: Merge.rc:1613
#, c-format
msgid "Fil&e compare"
msgstr "Com¶r os arquivos"
@@ -1456,7 +1456,7 @@
msgstr "Substituir &Tudo"
#: Merge.rc:872
-#: Merge.rc:2205
+#: Merge.rc:2202
#, c-format
msgid "Rational ClearCase"
msgstr "Rational ClearCase"
@@ -1467,7 +1467,7 @@
msgstr "Veja Isso"
#: Merge.rc:880
-#: Merge.rc:1175
+#: Merge.rc:1172
#, c-format
msgid "Comments"
msgstr "Coment\xE1rios"
@@ -1492,546 +1492,541 @@
msgid "Regular Expressions (one per line):"
msgstr "Express\xF5es Regulares (uma por linha):"
-#: Merge.rc:902
+#: Merge.rc:900
#, c-format
-msgid "Save"
-msgstr "Salvar"
-
-#: Merge.rc:903
-#, c-format
msgid "New"
msgstr "Novo"
-#: Merge.rc:904
+#: Merge.rc:901
#, c-format
msgid "Edit"
msgstr "Editar"
-#: Merge.rc:905
+#: Merge.rc:902
#, c-format
msgid "Remove"
msgstr "Remover"
-#: Merge.rc:910
-#: Merge.rc:1959
+#: Merge.rc:907
+#: Merge.rc:1956
#, c-format
msgid "Colors"
msgstr "Cores"
-#: Merge.rc:913
+#: Merge.rc:910
#, c-format
msgid "Difference:"
msgstr "Diferen\xE7a:"
-#: Merge.rc:917
+#: Merge.rc:914
#, c-format
msgid "Selected Difference:"
msgstr "Diferen\xE7a Selecionada:"
-#: Merge.rc:921
-#: Merge.rc:1566
+#: Merge.rc:918
+#: Merge.rc:1563
#, c-format
msgid "Background"
msgstr "2\xBA Plano"
-#: Merge.rc:922
+#: Merge.rc:919
#, c-format
msgid "Deleted"
msgstr "Apagado"
-#: Merge.rc:935
-#: Merge.rc:1361
-#: Merge.rc:1567
-#: Merge.rc:1960
+#: Merge.rc:932
+#: Merge.rc:1358
+#: Merge.rc:1564
+#: Merge.rc:1957
#, c-format
msgid "Text"
msgstr "Texto"
-#: Merge.rc:939
+#: Merge.rc:936
#, c-format
msgid "Ignored Difference:"
msgstr "Diferen\xE7a Ignorada:"
-#: Merge.rc:949
+#: Merge.rc:946
#, c-format
msgid "Moved:"
msgstr "Movido:"
-#: Merge.rc:959
+#: Merge.rc:956
#, c-format
msgid "Selected Moved:"
msgstr "Selecionado o Movido:"
-#: Merge.rc:966
+#: Merge.rc:963
#, c-format
msgid "Word Difference:"
msgstr "Diferen\xE7a das Palavras:"
-#: Merge.rc:976
+#: Merge.rc:973
#, c-format
msgid "Selected Word Diff:"
msgstr "Diferen\xE7a das Palavras Selecionadas:"
-#: Merge.rc:986
-#: Merge.rc:1065
-#: Merge.rc:1094
-#: Merge.rc:1177
-#: Merge.rc:1407
-#: Merge.rc:1699
+#: Merge.rc:983
+#: Merge.rc:1062
+#: Merge.rc:1091
+#: Merge.rc:1174
+#: Merge.rc:1404
+#: Merge.rc:1696
#, c-format
msgid "Defaults"
msgstr "Padr\xF5es"
-#: Merge.rc:992
-#: Merge.rc:1349
-#: Merge.rc:1555
+#: Merge.rc:989
+#: Merge.rc:1346
+#: Merge.rc:1552
#, c-format
msgid "Dialog"
msgstr "Di\xE1logo"
-#: Merge.rc:1002
-#: Merge.rc:1962
+#: Merge.rc:999
+#: Merge.rc:1959
#, c-format
msgid "System"
msgstr "Sistema"
-#: Merge.rc:1005
+#: Merge.rc:1002
#, c-format
msgid "&Send deleted files to Recycle Bin"
msgstr "&Enviar os arquivos apagados para o Recycle Bin"
-#: Merge.rc:1007
+#: Merge.rc:1004
#, c-format
msgid "&External editor:"
msgstr "&Editor externo:"
-#: Merge.rc:1010
+#: Merge.rc:1007
#, c-format
msgid "&Filter folder:"
msgstr "&Filtrar a pasta:"
-#: Merge.rc:1012
+#: Merge.rc:1009
#, c-format
msgid "B&rowse..."
msgstr "P&rocurar..."
-#: Merge.rc:1013
+#: Merge.rc:1010
#, c-format
msgid "Temporary files folder"
msgstr "Pasta dos arquivos tempor\xE1rios"
-#: Merge.rc:1014
+#: Merge.rc:1011
#, c-format
msgid "S&ystem's temp folder"
msgstr "P&asta tempor\xE1ria do sistema"
-#: Merge.rc:1016
+#: Merge.rc:1013
#, c-format
msgid "C&ustom folder:"
msgstr "P&asta personalizada:"
-#: Merge.rc:1019
-#: Merge.rc:1035
+#: Merge.rc:1016
+#: Merge.rc:1032
#, c-format
msgid "Br&owse..."
msgstr "Pr&ocurar..."
-#: Merge.rc:1025
+#: Merge.rc:1022
#, c-format
msgid "Patch Generator"
msgstr "Gerador de Patches"
-#: Merge.rc:1028
+#: Merge.rc:1025
#, c-format
msgid "File&1:"
msgstr "Arquivo&1:"
-#: Merge.rc:1032
+#: Merge.rc:1029
#, c-format
msgid "File&2:"
msgstr "Arquivo&2:"
-#: Merge.rc:1036
+#: Merge.rc:1033
#, c-format
msgid "&Swap"
msgstr "&Trocar"
-#: Merge.rc:1037
+#: Merge.rc:1034
#, c-format
msgid "&Append to existing file"
msgstr "&Anexar ao arquivo existente"
-#: Merge.rc:1039
+#: Merge.rc:1036
#, c-format
msgid "&Result:"
msgstr "&Resultado:"
-#: Merge.rc:1043
+#: Merge.rc:1040
#, c-format
msgid "&Format"
msgstr "&Formato"
-#: Merge.rc:1044
+#: Merge.rc:1041
#, c-format
msgid "St&yle:"
msgstr "Es&tilo:"
-#: Merge.rc:1047
+#: Merge.rc:1044
#, c-format
msgid "&Context:"
msgstr "&Contexto:"
-#: Merge.rc:1050
+#: Merge.rc:1047
#, c-format
msgid "W&hitespaces"
msgstr "E&spa\xE7os em branco"
-#: Merge.rc:1051
+#: Merge.rc:1048
#, c-format
msgid "Com&pare"
msgstr "Com¶r"
-#: Merge.rc:1053
+#: Merge.rc:1050
#, c-format
msgid "I&gnore changes"
msgstr "I&gnorar as mudan\xE7as"
-#: Merge.rc:1055
+#: Merge.rc:1052
#, c-format
msgid "Ig&nore all"
msgstr "Ig&norar tudo"
-#: Merge.rc:1057
+#: Merge.rc:1054
#, c-format
msgid "Ignor&e blank lines"
msgstr "Ignor&ar as linhas em branco"
-#: Merge.rc:1059
+#: Merge.rc:1056
#, c-format
msgid "Case sensi&tive"
msgstr "Caso sensi&tivo"
-#: Merge.rc:1061
+#: Merge.rc:1058
#, c-format
msgid "Inclu&de command line"
msgstr "Inclu&ir a linha de comando"
-#: Merge.rc:1063
+#: Merge.rc:1060
#, c-format
msgid "Open to e&xternal editor"
msgstr "Abrir no e&ditor externo"
-#: Merge.rc:1085
+#: Merge.rc:1082
#, c-format
msgid "Display Columns"
msgstr "Exibir Colunas"
-#: Merge.rc:1091
+#: Merge.rc:1088
#, c-format
msgid "Move &Up"
msgstr "Mover &pra Cima"
-#: Merge.rc:1092
+#: Merge.rc:1089
#, c-format
msgid "Move &Down"
msgstr "Mover &pra Baixo"
-#: Merge.rc:1102
+#: Merge.rc:1099
#, c-format
msgid "Select Unpacker"
msgstr "Selecionar o Desempacotador"
-#: Merge.rc:1107
+#: Merge.rc:1104
#, c-format
msgid "File unpacker:"
msgstr "Desempacotador do arquivo:"
-#: Merge.rc:1110
+#: Merge.rc:1107
#, c-format
msgid "Display all unpackers, don't check the extension"
msgstr "Exibir todos os desempacotadores, n\xE3o verificar a extens\xE3o"
-#: Merge.rc:1113
+#: Merge.rc:1110
#, c-format
msgid "Extensions list:"
msgstr "Lista das extens\xF5es:"
-#: Merge.rc:1114
+#: Merge.rc:1111
#, c-format
msgid "Description:"
msgstr "Descri\xE7\xE3o:"
-#: Merge.rc:1125
+#: Merge.rc:1122
#, c-format
msgid " Folder Compare Progress"
msgstr " Progresso da Compara\xE7\xE3o das Pastas"
-#: Merge.rc:1128
-#: Merge.rc:1909
+#: Merge.rc:1125
+#: Merge.rc:1906
#, c-format
msgid "Stop"
msgstr "Parar"
-#: Merge.rc:1133
+#: Merge.rc:1130
#, c-format
msgid "Comparing items..."
msgstr "Comparando os itens..."
-#: Merge.rc:1134
+#: Merge.rc:1131
#, c-format
msgid "Items compared:"
msgstr "Itens comparados:"
-#: Merge.rc:1135
+#: Merge.rc:1132
#, c-format
msgid "Items total:"
msgstr "Total de itens:"
-#: Merge.rc:1141
+#: Merge.rc:1138
#, c-format
msgid "Go To"
msgstr "Ir Para"
-#: Merge.rc:1144
+#: Merge.rc:1141
#, c-format
msgid "G&oto:"
msgstr "I&r para:"
-#: Merge.rc:1146
+#: Merge.rc:1143
#, c-format
msgid "File"
msgstr "Arquivo"
-#: Merge.rc:1151
+#: Merge.rc:1148
#, c-format
msgid "Goto what"
msgstr "Ir para"
-#: Merge.rc:1152
+#: Merge.rc:1149
#, c-format
msgid "Li&ne"
msgstr "Li&nha"
-#: Merge.rc:1154
+#: Merge.rc:1151
#, c-format
msgid "&Difference"
msgstr "&Diferen\xE7a"
-#: Merge.rc:1156
+#: Merge.rc:1153
#, c-format
msgid "&Go To"
msgstr "&Ir Para"
-#: Merge.rc:1162
-#: Merge.rc:1957
+#: Merge.rc:1159
+#: Merge.rc:1954
#, c-format
msgid "Compare"
msgstr "Comparar"
-#: Merge.rc:1165
+#: Merge.rc:1162
#, c-format
msgid "Whitespace"
msgstr "Espa\xE7o em branco"
-#: Merge.rc:1166
+#: Merge.rc:1163
#, c-format
msgid "&Compare"
msgstr "&Comparar"
-#: Merge.rc:1167
+#: Merge.rc:1164
#, c-format
msgid "&Ignore change"
msgstr "&Ignorar a mudan\xE7a"
-#: Merge.rc:1168
+#: Merge.rc:1165
#, c-format
msgid "I&gnore all"
msgstr "I&gnorar tudo"
-#: Merge.rc:1169
+#: Merge.rc:1166
#, c-format
msgid "Ignore blan&k lines"
msgstr "Ignorar as li&nhas em branco"
-#: Merge.rc:1170
+#: Merge.rc:1167
#, c-format
msgid "Ignore &case"
msgstr "Ignorar &caso sensitivo"
-#: Merge.rc:1171
+#: Merge.rc:1168
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgstr "Igno&rar diferen\xE7as de retorno dos procedimentos (Win/Unix/Mac)"
-#: Merge.rc:1173
+#: Merge.rc:1170
#, c-format
msgid "E&nable moved block detection"
msgstr "A&tivar a detec\xE7\xE3o dos blocos movidos"
-#: Merge.rc:1174
+#: Merge.rc:1171
#, c-format
msgid "&Match similar lines"
msgstr "&Combinar as linhas similares"
-#: Merge.rc:1176
+#: Merge.rc:1173
#, c-format
msgid "Filter Comments"
msgstr "Coment\xE1rios do Filtro"
-#: Merge.rc:1182
-#: Merge.rc:1958
+#: Merge.rc:1179
+#: Merge.rc:1955
#, c-format
msgid "Editor"
msgstr "Editor"
-#: Merge.rc:1185
+#: Merge.rc:1182
#, c-format
msgid "&Highlight syntax"
msgstr "&Destacar a sintaxe"
-#: Merge.rc:1187
+#: Merge.rc:1184
#, c-format
msgid "&Automatic rescan"
msgstr "&Re-escaneamento autom\xE1tico"
-#: Merge.rc:1189
+#: Merge.rc:1186
#, c-format
msgid "&Preserve original EOL chars"
msgstr "&Preservar os caracteres EOL originais"
-#: Merge.rc:1191
+#: Merge.rc:1188
#, c-format
msgid "Tabs"
msgstr "Abas"
-#: Merge.rc:1192
+#: Merge.rc:1189
#, c-format
msgid "&Tab size:"
msgstr "&Tamanho das abas:"
-#: Merge.rc:1195
+#: Merge.rc:1192
#, c-format
msgid "&Insert Tabs"
msgstr "&Inserir Abas"
-#: Merge.rc:1197
+#: Merge.rc:1194
#, c-format
msgid "Insert &Spaces"
msgstr "Inserir &Espa\xE7os"
-#: Merge.rc:1199
+#: Merge.rc:1196
#, c-format
msgid "Line Difference Coloring"
msgstr "Coloramento das Diferen\xE7as das Linhas"
-#: Merge.rc:1201
+#: Merge.rc:1198
#, c-format
msgid "View line differences"
msgstr "Visualizar as diferen\xE7as das linhas"
-#: Merge.rc:1203
+#: Merge.rc:1200
#, c-format
msgid "&Character level"
msgstr "&N\xEDvel dos caracteres"
-#: Merge.rc:1205
+#: Merge.rc:1202
#, c-format
msgid "&Word-level:"
msgstr "&N\xEDvel das palavras:"
-#: Merge.rc:1209
+#: Merge.rc:1206
#, c-format
msgid "W&ord break characters:"
msgstr ""
-#: Merge.rc:1222
+#: Merge.rc:1219
#, c-format
msgid "Filefilters"
msgstr "Filtros dos arquivos"
-#: Merge.rc:1228
+#: Merge.rc:1225
#, c-format
msgid "Test"
msgstr "Teste"
-#: Merge.rc:1229
+#: Merge.rc:1226
#, c-format
msgid "Install..."
msgstr "Instalar..."
-#: Merge.rc:1230
+#: Merge.rc:1227
#, c-format
msgid "New..."
msgstr "Novo..."
-#: Merge.rc:1231
+#: Merge.rc:1228
#, c-format
msgid "Edit..."
msgstr "Editar..."
-#: Merge.rc:1232
+#: Merge.rc:1229
#, c-format
msgid "Delete..."
msgstr "Apagar..."
-#: Merge.rc:1238
+#: Merge.rc:1235
#, c-format
msgid "Save modified files?"
msgstr "Salvar os arquivos modificados?"
-#: Merge.rc:1241
+#: Merge.rc:1238
#, c-format
msgid "Left side file"
msgstr "Arquivo do lado esquerdo"
-#: Merge.rc:1244
+#: Merge.rc:1241
#, c-format
msgid "&Save changes"
msgstr "&Salvar mudan\xE7as"
-#: Merge.rc:1246
+#: Merge.rc:1243
#, c-format
msgid "&Discard changes"
msgstr "&Descartar mudan\xE7as"
-#: Merge.rc:1248
+#: Merge.rc:1245
#, c-format
msgid "Right side file"
msgstr "Arquivo do lado direito"
-#: Merge.rc:1251
+#: Merge.rc:1248
#, c-format
msgid "S&ave changes"
msgstr "S&alvar mudan\xE7as"
-#: Merge.rc:1253
+#: Merge.rc:1250
#, c-format
msgid "Dis&card changes"
msgstr "Des&cartar mudan\xE7as"
-#: Merge.rc:1255
+#: Merge.rc:1252
#, c-format
msgid "Disca&rd All"
msgstr ""
-#: Merge.rc:1262
-#: Merge.rc:1510
-#: Merge.rc:1964
+#: Merge.rc:1259
+#: Merge.rc:1507
+#: Merge.rc:1961
#, c-format
msgid "Codepage"
msgstr "C\xF3digo da p\xE1gina"
-#: Merge.rc:1265
+#: Merge.rc:1262
#, c-format
msgid "Default Codepage"
msgstr "C\xF3digo da P\xE1gina Padr\xE3o"
-#: Merge.rc:1266
+#: Merge.rc:1263
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr "Selecionar o c\xF3digo de p\xE1gina padr\xE3o assumido quando carregar arquivos n\xE3o-unicode:"
-#: Merge.rc:1268
+#: Merge.rc:1265
#, c-format
msgid ""
"Detect codepage info for these files: .html, .rc, .xml \n"
@@ -2040,56 +2035,56 @@
"Detectar a info do c\xF3digo de p\xE1gina para estes arquivos : .html, .rc, .xml \n"
"precisa reiniciar a sess\xE3o"
-#: Merge.rc:1271
+#: Merge.rc:1268
#, c-format
msgid "System codepage"
msgstr "C\xF3digo de p\xE1gina do sistema"
-#: Merge.rc:1273
+#: Merge.rc:1270
#, c-format
msgid "According to WinMerge User Interface"
msgstr "De Acordo com a Interface do Usu\xE1rio do WinMerge"
-#: Merge.rc:1275
+#: Merge.rc:1272
#, c-format
msgid "Custom codepage:"
msgstr "C\xF3digo de p\xE1gina personalizado:"
-#: Merge.rc:1283
+#: Merge.rc:1280
#, c-format
msgid "WinMerge - Archive support disabled"
msgstr "WinMerge - Suporte para arquivos desativado"
-#: Merge.rc:1286
+#: Merge.rc:1283
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr "Incapaz de detectar a vers\xE3o do 7-Zip (n\xE3o instalado?)"
-#: Merge.rc:1289
+#: Merge.rc:1286
#, c-format
msgid ""
"Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
"essential components to be copied to the program directory for standalone operation."
msgstr "O suporte para arquivos requer que o 7-Zip 3.11 ou posterior esteja instalado no seu computador, ou que seus componentes essenciais sejam copiados para o diret\xF3rio do programa para opera\xE7\xE3o isolada."
-#: Merge.rc:1291
+#: Merge.rc:1288
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr "Deve haver tamb\xE9m um plugin com interface apropriada (Merge7z*.dll) no caminho."
-#: Merge.rc:1293
+#: Merge.rc:1290
#, c-format
msgid ""
"Please use the version of 7-Zip recommended below until interface plugins for later\n"
"versions become available."
msgstr "Por favor use a vers\xE3o do 7-Zip recomendada abaixo at\xE9 que os plugins de interface para as vers\xF5es posteriores se tornem dispon\xEDveis."
-#: Merge.rc:1295
+#: Merge.rc:1292
#, c-format
msgid "Version"
msgstr "Vers\xE3o"
-#: Merge.rc:1297
+#: Merge.rc:1294
#, c-format
msgid ""
"Plugin required\n"
@@ -2098,54 +2093,54 @@
"Plugin requerido\n"
"(dllbuild %04u)"
-#: Merge.rc:1299
+#: Merge.rc:1296
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr "Vers\xE3o recomendada do 7-Zip:"
+#: Merge.rc:1299
#: Merge.rc:1302
-#: Merge.rc:1305
#, c-format
msgid "present"
msgstr "atual"
-#: Merge.rc:1303
+#: Merge.rc:1300
#, c-format
msgid "Merge7z000U.dll"
msgstr "Merge7z000U.dll"
-#: Merge.rc:1306
+#: Merge.rc:1303
#, c-format
msgid "7-Zip software installed on your computer:"
msgstr "Software 7-Zip instalado no seu computador:"
-#: Merge.rc:1308
-#: Merge.rc:1313
+#: Merge.rc:1305
+#: Merge.rc:1310
#, c-format
msgid "none"
msgstr "nenhum"
-#: Merge.rc:1310
+#: Merge.rc:1307
#, c-format
msgid "missing"
msgstr "faltando"
-#: Merge.rc:1311
+#: Merge.rc:1308
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr "Componentes do 7-Zip para opera\xE7\xE3o isolada:"
-#: Merge.rc:1315
+#: Merge.rc:1312
#, c-format
msgid "outdated"
msgstr "desatualizado"
-#: Merge.rc:1316
+#: Merge.rc:1313
#, c-format
msgid "Plugins on path:"
msgstr "Plugins no caminho:"
-#: Merge.rc:1317
+#: Merge.rc:1314
#, c-format
msgid ""
"Don't display this &message again.\n"
@@ -2154,567 +2149,567 @@
"N\xE3o exibir esta mensagem de novo.\n"
"(Voc\xEA pode sempre chamar de novo esta mensagem no menu Ajuda.)"
-#: Merge.rc:1321
+#: Merge.rc:1318
#, c-format
msgid "Plugin Download"
msgstr "Download do Plugin"
-#: Merge.rc:1330
+#: Merge.rc:1327
#, c-format
msgid "Options"
msgstr "Op\xE7\xF5es"
-#: Merge.rc:1341
+#: Merge.rc:1338
#, c-format
msgid " Categories"
msgstr " Categorias"
-#: Merge.rc:1343
+#: Merge.rc:1340
#, c-format
msgid "Import..."
msgstr "Importar..."
-#: Merge.rc:1344
+#: Merge.rc:1341
#, c-format
msgid "Export..."
msgstr "Exportar..."
-#: Merge.rc:1352
+#: Merge.rc:1349
#, c-format
msgid "Keywords:"
msgstr "Palavras-chave:"
-#: Merge.rc:1353
+#: Merge.rc:1350
#, c-format
msgid "Function names:"
msgstr "Nomes das fun\xE7\xF5es:"
-#: Merge.rc:1354
+#: Merge.rc:1351
#, c-format
msgid "Comments:"
msgstr "Coment\xE1rios:"
-#: Merge.rc:1355
+#: Merge.rc:1352
#, c-format
msgid "Numbers:"
msgstr "N\xFAmeros:"
-#: Merge.rc:1356
+#: Merge.rc:1353
#, c-format
msgid "Operators:"
msgstr "Operadores:"
-#: Merge.rc:1357
+#: Merge.rc:1354
#, c-format
msgid "Strings:"
msgstr "Strings:"
-#: Merge.rc:1358
+#: Merge.rc:1355
#, c-format
msgid "Preprocessor:"
msgstr "Pr\xE9-processador:"
-#: Merge.rc:1359
+#: Merge.rc:1356
#, c-format
msgid "User 1:"
msgstr "Usu\xE1rio 1:"
-#: Merge.rc:1360
+#: Merge.rc:1357
#, c-format
msgid "User 2:"
msgstr "Usu\xE1rio 2:"
-#: 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
+#: Merge.rc:1362
+#: Merge.rc:1367
+#: Merge.rc:1372
+#: Merge.rc:1377
+#: Merge.rc:1382
+#: Merge.rc:1387
+#: Merge.rc:1392
+#: Merge.rc:1397
+#: Merge.rc:1402
#, c-format
msgid "Bold"
msgstr "Negrito"
-#: Merge.rc:1413
+#: Merge.rc:1410
#, c-format
msgid "Folder Compare Report"
msgstr "Relat\xF3rio sobre a Compara\xE7\xE3o das Pastas"
-#: Merge.rc:1416
+#: Merge.rc:1413
#, c-format
msgid "Report &File:"
msgstr "Reportar &Arquivo:"
-#: Merge.rc:1419
-#: Merge.rc:1593
-#: Merge.rc:1597
-#: Merge.rc:1624
+#: Merge.rc:1416
+#: Merge.rc:1590
+#: Merge.rc:1594
+#: Merge.rc:1621
#, c-format
msgid "Browse..."
msgstr "Procurar..."
-#: Merge.rc:1420
+#: Merge.rc:1417
#, c-format
msgid "&Style:"
msgstr "&Estilo:"
-#: Merge.rc:1423
+#: Merge.rc:1420
#, c-format
msgid "&Copy to Clipboard"
msgstr "&Copiar para a \xC1rea de Transfer\xEAncia"
-#: Merge.rc:1431
+#: Merge.rc:1428
#, c-format
msgid "Shared or Private Filter"
msgstr "Filtro Compartilhado ou Privado"
-#: Merge.rc:1434
+#: Merge.rc:1431
#, c-format
msgid "Which type of filter do you want to create?"
msgstr "Que tipo de filtro voc\xEA quer criar?"
-#: Merge.rc:1436
+#: Merge.rc:1433
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr "Filtro Compartilhado (para todos os usu\xE1rios nesta m\xE1quina)"
-#: Merge.rc:1438
+#: Merge.rc:1435
#, c-format
msgid "Private Filter (only for current user)"
msgstr "Filtro Privado (s\xF3 para o usu\xE1rio atual)"
-#: Merge.rc:1446
-#: Merge.rc:1965
+#: Merge.rc:1443
+#: Merge.rc:1962
#, c-format
msgid "Archive Support"
msgstr "Suporte para Arquivos"
-#: Merge.rc:1449
+#: Merge.rc:1446
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
msgstr "O suporte para arquivos requer o plugin do 7-zip instalado:"
-#: Merge.rc:1451
+#: Merge.rc:1448
#, c-format
msgid "Download 7-zip Plugin"
msgstr "Baixar o Plugin do 7-zip"
-#: Merge.rc:1452
+#: Merge.rc:1449
#, c-format
msgid "&Enable archive file support"
msgstr "&Ativar o suporte para arquivos dentro do arquivo"
-#: Merge.rc:1454
+#: Merge.rc:1451
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr "&Usar 7-zip isolado se dispon\xEDvel"
-#: Merge.rc:1457
+#: Merge.rc:1454
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr "U&sar 7-Zip local da pasta do WinMerge"
-#: Merge.rc:1459
+#: Merge.rc:1456
#, c-format
msgid "&Detect archive type from file signature"
msgstr "&Detectar o tipo de arquivo da assinatura do arquivo"
-#: Merge.rc:1467
+#: Merge.rc:1464
#, c-format
msgid "Compare Statistics"
msgstr "Comparar as Estat\xEDsticas"
-#: Merge.rc:1470
+#: Merge.rc:1467
#, c-format
msgid "Folders:"
msgstr "Pastas:"
-#: Merge.rc:1471
+#: Merge.rc:1468
#, c-format
msgid "Files:"
msgstr "Arquivos:"
-#: Merge.rc:1472
-#: Merge.rc:2359
+#: Merge.rc:1469
+#: Merge.rc:2356
#, c-format
msgid "Different"
msgstr "Diferente"
-#: Merge.rc:1473
+#: Merge.rc:1470
#, c-format
msgid "Text:"
msgstr "Texto:"
-#: Merge.rc:1476
-#: Merge.rc:1495
+#: Merge.rc:1473
+#: Merge.rc:1492
#, c-format
msgid "Binary:"
msgstr "Bin\xE1rio:"
-#: Merge.rc:1479
+#: Merge.rc:1476
#, c-format
msgid "Unique"
msgstr "\xDAnico"
-#: Merge.rc:1480
+#: Merge.rc:1477
#, c-format
msgid "Left:"
msgstr "Esquerda:"
-#: Merge.rc:1485
+#: Merge.rc:1482
#, c-format
msgid "Right:"
msgstr "Direita:"
-#: Merge.rc:1490
-#: Merge.rc:2353
+#: Merge.rc:1487
+#: Merge.rc:2350
#, c-format
msgid "Identical"
msgstr "Id\xEAnticos"
-#: Merge.rc:1499
+#: Merge.rc:1496
#, c-format
msgid "Total:"
msgstr "Total:"
-#: Merge.rc:1504
+#: Merge.rc:1501
#, c-format
msgid "Close"
msgstr "Fechar"
-#: Merge.rc:1513
+#: Merge.rc:1510
#, c-format
msgid "Affects"
msgstr "Afeta"
+#: Merge.rc:1513
#: Merge.rc:1516
-#: Merge.rc:1519
#, c-format
msgid "(Affects)"
msgstr "(Afeta)"
-#: Merge.rc:1520
+#: Merge.rc:1517
#, c-format
msgid "Select Codepage for"
msgstr "Selecionar o C\xF3digo da P\xE1gina para"
-#: Merge.rc:1521
+#: Merge.rc:1518
#, c-format
msgid "&File Loading:"
msgstr "&Carregamento do Arquivo:"
+#: Merge.rc:1520
#: Merge.rc:1523
-#: Merge.rc:1526
#, c-format
msgid "..."
msgstr "..."
-#: Merge.rc:1524
+#: Merge.rc:1521
#, c-format
msgid "File &Saving:"
msgstr "Salvamento do &Arquivo:"
-#: Merge.rc:1527
+#: Merge.rc:1524
#, c-format
msgid "&Use same codepage for both"
msgstr "&Usar o mesmo c\xF3digo de p\xE1gina para ambos"
-#: Merge.rc:1530
+#: Merge.rc:1527
#, c-format
msgid "&Apply"
msgstr "&Aplicar"
-#: Merge.rc:1531
-#: Merge.rc:1931
+#: Merge.rc:1528
+#: Merge.rc:1928
#, c-format
msgid "&Cancel"
msgstr "&Cancelar"
-#: Merge.rc:1536
+#: Merge.rc:1533
#, c-format
msgid "Test Filter"
msgstr "Testar Filtro"
-#: Merge.rc:1539
+#: Merge.rc:1536
#, c-format
msgid "Testing filter ..."
msgstr "Testando o filtro ..."
-#: Merge.rc:1541
+#: Merge.rc:1538
#, c-format
msgid "&Enter text to test:"
msgstr "&Inserir o texto para testar:"
-#: Merge.rc:1543
+#: Merge.rc:1540
#, c-format
msgid "&Folder Name"
msgstr "&Nome da Pasta"
-#: Merge.rc:1545
+#: Merge.rc:1542
#, c-format
msgid "Result:"
msgstr "Resultado:"
-#: Merge.rc:1549
+#: Merge.rc:1546
#, c-format
msgid "&Test"
msgstr "&Teste"
-#: Merge.rc:1550
+#: Merge.rc:1547
#, c-format
msgid "&Close"
msgstr "&Fechar"
-#: Merge.rc:1558
+#: Merge.rc:1555
#, c-format
msgid "&Use customized text colors"
msgstr "&Usar cores de texto personalizadas"
-#: Merge.rc:1561
+#: Merge.rc:1558
#, c-format
msgid "Custom text colors"
msgstr "Cores de texto personalizadas"
-#: Merge.rc:1563
+#: Merge.rc:1560
#, c-format
msgid "Whitespace:"
msgstr "Espa\xE7o vazio:"
-#: Merge.rc:1564
+#: Merge.rc:1561
#, c-format
msgid "Regular text:"
msgstr "Texto regular:"
-#: Merge.rc:1565
+#: Merge.rc:1562
#, c-format
msgid "Selection:"
msgstr "Sele\xE7\xE3o:"
-#: Merge.rc:1588
+#: Merge.rc:1585
#, c-format
msgid "Paths"
msgstr "Caminhos"
-#: Merge.rc:1594
+#: Merge.rc:1591
#, c-format
msgid "R&ead-only"
msgstr "S&omente-leitura"
-#: Merge.rc:1598
+#: Merge.rc:1595
#, c-format
msgid "Re&ad-only"
msgstr "So&mente-leitura"
-#: Merge.rc:1604
+#: Merge.rc:1601
#, c-format
msgid "Open..."
msgstr "Abrir..."
-#: Merge.rc:1605
+#: Merge.rc:1602
#, c-format
msgid "Save..."
msgstr "Salvar..."
-#: Merge.rc:1610
-#: Merge.rc:1966
+#: Merge.rc:1607
+#: Merge.rc:1963
#, c-format
msgid "Backup Files"
msgstr "Arquivos de Backup"
-#: Merge.rc:1613
+#: Merge.rc:1610
#, c-format
msgid "Create backup files in:"
msgstr "Criar arquivos de backup em:"
-#: Merge.rc:1618
+#: Merge.rc:1615
#, c-format
msgid "Create backup files into:"
msgstr "Criar arquivos de backup em:"
-#: Merge.rc:1619
+#: Merge.rc:1616
#, c-format
msgid "&Original file's folder"
msgstr "&Pasta do arquivo original"
-#: Merge.rc:1621
+#: Merge.rc:1618
#, c-format
msgid "&Global backup folder:"
msgstr "&Pasta de backup global:"
-#: Merge.rc:1625
+#: Merge.rc:1622
#, c-format
msgid "Backup filename:"
msgstr "Nome do arquivo de backup:"
-#: Merge.rc:1626
+#: Merge.rc:1623
#, c-format
msgid "&Append .bak -extension"
msgstr "&Anexar a extens\xE3o .bak"
-#: Merge.rc:1628
+#: Merge.rc:1625
#, c-format
msgid "A&ppend timestamp"
msgstr "A&nexar a estampa de tempo"
-#: Merge.rc:1635
-#: Merge.rc:2261
+#: Merge.rc:1632
+#: Merge.rc:2258
#, c-format
msgid "Confirm Copy"
msgstr "Confirmar a C\xF3pia"
-#: Merge.rc:1639
+#: Merge.rc:1636
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr "Voc\xEA tem certeza que voc\xEA quer copiar os itens XXX?"
-#: Merge.rc:1641
+#: Merge.rc:1638
#, c-format
msgid "From left"
msgstr "Da esquerda"
-#: Merge.rc:1644
+#: Merge.rc:1641
#, c-format
msgid "To right"
msgstr "Para a direita"
-#: Merge.rc:1647
+#: Merge.rc:1644
#, c-format
msgid "Yes"
msgstr "Sim"
-#: Merge.rc:1648
+#: Merge.rc:1645
#, c-format
msgid "No"
msgstr "N\xE3o"
-#: Merge.rc:1654
+#: Merge.rc:1651
#, c-format
msgid "Plugins"
msgstr "Plugins"
-#: Merge.rc:1657
+#: Merge.rc:1654
#, c-format
msgid "&Enable plugins"
msgstr "&Ativar plugins"
-#: Merge.rc:1668
-#: Merge.rc:1967
+#: Merge.rc:1665
+#: Merge.rc:1964
#, c-format
msgid "Shell Integration"
msgstr "Integra\xE7\xE3o com o Shell"
-#: Merge.rc:1671
+#: Merge.rc:1668
#, c-format
msgid "Explorer"
msgstr "Explorer"
-#: Merge.rc:1672
+#: Merge.rc:1669
#, c-format
msgid "E&nable advanced menu"
msgstr "A&tivar o menu avan\xE7ado"
-#: Merge.rc:1674
+#: Merge.rc:1671
#, c-format
msgid "In&clude subfolders by default"
msgstr "In&cluir as sub-pastas por padr\xE3o"
-#: Merge.rc:1676
+#: Merge.rc:1673
#, c-format
msgid "&Add to context menu"
msgstr "&Adicionar ao menu de contexto"
-#: Merge.rc:1678
+#: Merge.rc:1675
#, c-format
msgid "Folder compare"
msgstr "Comparar as pastas"
-#: Merge.rc:1679
+#: Merge.rc:1676
#, c-format
msgid "Add &Shell menu to context menu"
msgstr "Adicionar o &menu do Shell ao menu de contexto"
-#: Merge.rc:1686
-#: Merge.rc:1970
-#: Merge.rc:2307
+#: Merge.rc:1683
+#: Merge.rc:1967
+#: Merge.rc:2304
#, c-format
msgid "Folder"
msgstr "Pasta"
-#: Merge.rc:1689
+#: Merge.rc:1686
#, c-format
msgid "&Compare method:"
msgstr ""
-#: Merge.rc:1691
+#: Merge.rc:1688
#, c-format
msgid "S&top after first difference"
msgstr "P&arar ap\xF3s a primeira diferen\xE7a"
-#: Merge.rc:1693
+#: Merge.rc:1690
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr "Ign&orar as diferen\xE7as de hora menores do que 3 segundos"
-#: Merge.rc:1695
+#: Merge.rc:1692
#, c-format
msgid "&Include unique subfolders contents"
msgstr ""
-#: Merge.rc:1697
+#: Merge.rc:1694
#, c-format
msgid "&Quick compare limit (MB):"
msgstr ""
#. StringFileInfo.Block
-#: Merge.rc:1723
+#: Merge.rc:1720
#, c-format
msgid "040904e4"
msgstr "041604e4"
#. VarFileInfo.Translation
-#: Merge.rc:1739
+#: Merge.rc:1736
#, c-format
msgid "0x409, 1252"
msgstr "0x416, 1252"
-#: Merge.rc:1754
+#: Merge.rc:1751
#, c-format
msgid "Ready"
msgstr "Pronto"
-#: Merge.rc:1760
+#: Merge.rc:1757
#, c-format
msgid "EXT"
msgstr "EXT"
-#: Merge.rc:1761
+#: Merge.rc:1758
#, c-format
msgid "CAP"
msgstr "CAP"
-#: Merge.rc:1762
+#: Merge.rc:1759
#, c-format
msgid "NUM"
msgstr "NUM"
-#: Merge.rc:1763
+#: Merge.rc:1760
#, c-format
msgid "SCRL"
msgstr "SCRL"
-#: Merge.rc:1764
+#: Merge.rc:1761
#, c-format
msgid "OVR"
msgstr "OVR"
-#: Merge.rc:1765
+#: Merge.rc:1762
#, c-format
msgid "REC"
msgstr "REC"
-#: Merge.rc:1771
+#: Merge.rc:1768
#, c-format
msgid ""
"Create empty documents\n"
@@ -2723,7 +2718,7 @@
"Criar documentos vazios\n"
"Novos Documentos (Ctrl+N)"
-#: Merge.rc:1772
+#: Merge.rc:1769
#, c-format
msgid ""
"Open an existing document\n"
@@ -2732,7 +2727,7 @@
"Abrir um documento existente\n"
"Abrir"
-#: Merge.rc:1773
+#: Merge.rc:1770
#, c-format
msgid ""
"Close the active document\n"
@@ -2741,7 +2736,7 @@
"Fechar o documento ativo\n"
"Fechar"
-#: Merge.rc:1774
+#: Merge.rc:1771
#, c-format
msgid ""
"Save the active document\n"
@@ -2750,7 +2745,7 @@
"Salvar o documento ativo\n"
"Salvar"
-#: Merge.rc:1775
+#: Merge.rc:1772
#, c-format
msgid ""
"Save the active document with a new name\n"
@@ -2759,7 +2754,7 @@
"Salvar o documento ativo com um novo nome\n"
"Salvar Como"
-#: Merge.rc:1776
+#: Merge.rc:1773
#, c-format
msgid ""
"Change the printing options\n"
@@ -2768,7 +2763,7 @@
"Mudar as op\xE7\xF5es de impress\xE3o\n"
"Configurar P\xE1gina"
-#: Merge.rc:1777
+#: Merge.rc:1774
#, c-format
msgid ""
"Change the printer and printing options\n"
@@ -2777,7 +2772,7 @@
"Mudar a impressora e as op\xE7\xF5es de impress\xE3o\n"
"Configurar a impress\xE3o"
-#: Merge.rc:1778
+#: Merge.rc:1775
#, c-format
msgid ""
"Print the active document\n"
@@ -2786,7 +2781,7 @@
"Imprimir o documento ativo\n"
"Imprimir"
-#: Merge.rc:1779
+#: Merge.rc:1776
#, c-format
msgid ""
"Display full pages\n"
@@ -2795,27 +2790,27 @@
"Exibir p\xE1ginas completas\n"
"Pr\xE9-Visualizar Impress\xE3o"
-#: Merge.rc:1784
+#: Merge.rc:1781
#, c-format
msgid "Make all hidden items visible again"
msgstr "Tornar todos os itens escondidos vis\xEDveis de novo"
-#: Merge.rc:1785
+#: Merge.rc:1782
#, c-format
msgid "Toggle tree mode"
msgstr "Ativar o modo \xE1rvore"
-#: Merge.rc:1786
+#: Merge.rc:1783
#, c-format
msgid "Expand all subfolders"
msgstr "Expandir todas as sub-pastas"
-#: Merge.rc:1787
+#: Merge.rc:1784
#, c-format
msgid "Collapse all subfolders"
msgstr "Retrair todas as sub-pastas"
-#: Merge.rc:1793
+#: Merge.rc:1790
#, c-format
msgid ""
"Open project file\n"
@@ -2824,32 +2819,32 @@
"Abrir o arquivo do projeto\n"
"Arquivo do projeto (Ctrl+J)"
-#: Merge.rc:1794
+#: Merge.rc:1791
#, c-format
msgid "Unknown error attempting to open project file"
msgstr "Erro desconhecido ao tentar abrir o arquivo do projeto"
-#: Merge.rc:1795
+#: Merge.rc:1792
#, c-format
msgid "Unknown error attempting to save project file"
msgstr "Erro desconhecido ao tentar salvar o arquivo do projeto"
-#: Merge.rc:1796
+#: Merge.rc:1793
#, c-format
msgid "Project File"
msgstr "Arquivo do Projeto"
-#: Merge.rc:1797
+#: Merge.rc:1794
#, c-format
msgid "Project file successfully loaded."
msgstr "Arquivo do projeto carregado com sucesso."
-#: Merge.rc:1798
+#: Merge.rc:1795
#, c-format
msgid "Project file successfully saved."
msgstr "Arquivo do projeto salvo com sucesso."
-#: Merge.rc:1799
+#: Merge.rc:1796
#, c-format
msgid ""
"Save current paths and options to project file\n"
@@ -2858,7 +2853,7 @@
"Salvar os caminhos atuais e op\xE7\xF5es no arquivo do projeto\n"
"Salvar o Arquivo do Projeto"
-#: Merge.rc:1804
+#: Merge.rc:1801
#, c-format
msgid ""
"Display program information, version number and copyright\n"
@@ -2867,7 +2862,7 @@
"Exibir as informa\xE7\xF5es do programa, n\xFAmero da vers\xE3o e copyright\n"
"Sobre"
-#: Merge.rc:1805
+#: Merge.rc:1802
#, c-format
msgid ""
"Quit the application; prompts to save documents\n"
@@ -2876,6 +2871,9 @@
"Sair do aplicativo; alertar para salvar os documentos\n"
"Sair"
+#: Merge.rc:1808
+#: Merge.rc:1809
+#: Merge.rc:1810
#: Merge.rc:1811
#: Merge.rc:1812
#: Merge.rc:1813
@@ -2889,14 +2887,11 @@
#: Merge.rc:1821
#: Merge.rc:1822
#: Merge.rc:1823
-#: Merge.rc:1824
-#: Merge.rc:1825
-#: Merge.rc:1826
#, c-format
msgid "Open this document"
msgstr "Abrir este documento"
-#: Merge.rc:1831
+#: Merge.rc:1828
#, c-format
msgid ""
"Switch to the next window pane\n"
@@ -2905,7 +2900,7 @@
"Troca para o pr\xF3ximo painel da janela\n"
"Painel Seguinte"
-#: Merge.rc:1832
+#: Merge.rc:1829
#, c-format
msgid ""
"Switch back to the previous window pane\n"
@@ -2914,7 +2909,7 @@
"Troca de volta para o painel da janela anterior\n"
"Painel Anterior"
-#: Merge.rc:1838
+#: Merge.rc:1835
#, c-format
msgid ""
"Arrange windows so they overlap\n"
@@ -2923,7 +2918,7 @@
"Organiza as janelas para que elas se sobreponham\n"
"Janelas em Cascata"
-#: Merge.rc:1839
+#: Merge.rc:1836
#, c-format
msgid ""
"Arrange windows as non-overlapping tiles horizontally\n"
@@ -2932,7 +2927,7 @@
"Organizar as janelas lado a lado n\xE3o sobrepostas horizontalmente\n"
"Janelas Lado a Lado Horizontalmente"
-#: Merge.rc:1840
+#: Merge.rc:1837
#, c-format
msgid ""
"Arrange windows as non-overlapping tiles vertically\n"
@@ -2941,7 +2936,7 @@
"Organizar as janelas lado a lado n\xE3o sobrepostas verticalmente\n"
"Janelas Lado a Lado Verticalmente"
-#: Merge.rc:1846
+#: Merge.rc:1843
#, c-format
msgid ""
"Copy the selection and put it on the Clipboard\n"
@@ -2950,7 +2945,7 @@
"Copia a sele\xE7\xE3o e a p\xF5e na \xC1rea de Transfer\xEAncia\n"
"Copiar"
-#: Merge.rc:1847
+#: Merge.rc:1844
#, c-format
msgid ""
"Cut the selection and put it on the Clipboard\n"
@@ -2959,7 +2954,7 @@
"Corta a sele\xE7\xE3o e a p\xF5e na \xC1rea de Transfer\xEAncia\n"
"Cortar"
-#: Merge.rc:1848
+#: Merge.rc:1845
#, c-format
msgid ""
"Find the specified text\n"
@@ -2968,7 +2963,7 @@
"Achar o texto especificado\n"
"Achar"
-#: Merge.rc:1849
+#: Merge.rc:1846
#, c-format
msgid ""
"Insert Clipboard contents\n"
@@ -2977,7 +2972,7 @@
"Inserir os conte\xFAdos da \xC1rea de Transfer\xEAncia\n"
"Colar"
-#: Merge.rc:1850
+#: Merge.rc:1847
#, c-format
msgid ""
"Repeat the last action\n"
@@ -2986,7 +2981,7 @@
"Repetir a \xFAltima a\xE7\xE3o\n"
"Repetir"
-#: Merge.rc:1851
+#: Merge.rc:1848
#, c-format
msgid ""
"Replace specific text with different text\n"
@@ -2995,7 +2990,7 @@
"Substitui o texto espec\xEDfico com um texto diferente\n"
"Substituir"
-#: Merge.rc:1852
+#: Merge.rc:1849
#, c-format
msgid ""
"Select the entire document\n"
@@ -3004,7 +2999,7 @@
"Seleciona o documento inteiro\n"
"Selecionar Tudo"
-#: Merge.rc:1853
+#: Merge.rc:1850
#, c-format
msgid ""
"Undo the last action\n"
@@ -3013,7 +3008,7 @@
"Desfazer a \xFAltima a\xE7\xE3o\n"
"Desfazer"
-#: Merge.rc:1854
+#: Merge.rc:1851
#, c-format
msgid ""
"Redo the previously undone action\n"
@@ -3022,7 +3017,7 @@
"Refazer a a\xE7\xE3o desfeita anteriormente\n"
"Refazer"
-#: Merge.rc:1860
+#: Merge.rc:1857
#, c-format
msgid ""
"Show or hide the toolbar\n"
@@ -3031,7 +3026,7 @@
"Mostrar ou esconder a barra de ferramentas\n"
"Ativar a Barra de Ferramentas"
-#: Merge.rc:1861
+#: Merge.rc:1858
#, c-format
msgid ""
"Show or hide the status bar\n"
@@ -3040,7 +3035,7 @@
"Mostrar ou esconder a barra de status\n"
"Ativar a Barra de Status"
-#: Merge.rc:1862
+#: Merge.rc:1859
#, c-format
msgid ""
"Show or hide the tab bar\n"
@@ -3049,7 +3044,7 @@
"Mostrar ou esconder a barra das abas\n"
"Ativar a Barra das Abas"
-#: Merge.rc:1863
+#: Merge.rc:1860
#, c-format
msgid ""
"Automatically resize panes\n"
@@ -3058,57 +3053,57 @@
"Automaticamente redimensionar os pain\xE9is\n"
"Trancar os Pain\xE9is"
-#: Merge.rc:1869
+#: Merge.rc:1866
#, c-format
msgid "Change the window size"
msgstr "Mudar o tamanho da janela"
-#: Merge.rc:1870
+#: Merge.rc:1867
#, c-format
msgid "Change the window position"
msgstr "Mudar a posi\xE7\xE3o da janela"
-#: Merge.rc:1871
+#: Merge.rc:1868
#, c-format
msgid "Reduce the window to an icon"
msgstr "Reduzir a janela a um \xEDcone"
-#: Merge.rc:1872
+#: Merge.rc:1869
#, c-format
msgid "Enlarge the window to full size"
msgstr "Aumentar a janela para o tamanho completo"
-#: Merge.rc:1873
+#: Merge.rc:1870
#, c-format
msgid "Switch to the next document window"
msgstr "Trocar para a pr\xF3xima janela do documento"
-#: Merge.rc:1874
+#: Merge.rc:1871
#, c-format
msgid "Switch to the previous document window"
msgstr "Trocar para a janela do documento anterior"
-#: Merge.rc:1875
+#: Merge.rc:1872
#, c-format
msgid "Close the active window and prompts to save the documents"
msgstr "Fecha a janela ativa e alerta para salvar os documentos"
-#: Merge.rc:1880
+#: Merge.rc:1877
#, c-format
msgid "Restore the window to normal size"
msgstr "Restaurar a janela para o tamanho normal"
-#: Merge.rc:1881
+#: Merge.rc:1878
#, c-format
msgid "Activate Task List"
msgstr "Ativar a Lista de Tarefas"
-#: Merge.rc:1882
+#: Merge.rc:1879
#, c-format
msgid "Activate this window"
msgstr "Ativar esta janela"
-#: Merge.rc:1888
+#: Merge.rc:1885
#, c-format
msgid ""
"Close print preview mode\n"
@@ -3117,7 +3112,7 @@
"Fechar o modo de pr\xE9-visualiza\xE7\xE3o da impress\xE3o\n"
"Cancelar a Pr\xE9-Visualiza\xE7\xE3o"
-#: Merge.rc:1895
+#: Merge.rc:1892
#, c-format
msgid ""
"\n"
@@ -3136,7 +3131,7 @@
"WinMerge.FileCompare\n"
"Compara\xE7\xE3o dos Arquivos do WinMerge"
-#: Merge.rc:1896
+#: Merge.rc:1893
#, c-format
msgid ""
"\n"
@@ -3155,23 +3150,23 @@
"WinMerge.FolderCompare\n"
"Compara\xE7\xE3o das Pastas do WinMerge"
-#: Merge.rc:1903
+#: Merge.rc:1900
#, c-format
msgid "Preserve original EOL chars"
msgstr "Preservar os caracs. EOL originais"
-#: Merge.rc:1910
+#: Merge.rc:1907
#, c-format
msgid "Press any key"
msgstr "Pressione qualquer tecla"
-#: Merge.rc:1916
-#: Merge.rc:1917
+#: Merge.rc:1913
+#: Merge.rc:1914
#, c-format
msgid "Right click on the path to copy"
msgstr "Clique com o direito no caminho para copiar"
-#: Merge.rc:1923
+#: Merge.rc:1920
#, c-format
msgid ""
"Developers:\n"
@@ -3180,158 +3175,158 @@
"Desenvolvedores:\n"
"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
-#: Merge.rc:1924
+#: Merge.rc:1921
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
msgstr "WinMerge vem com ABSOLUTAMENTE NENHUMA GARANTIA. Este \xE9 um software livre e voc\xEA \xE9 bem vindo para redistribu\xED-lo sob certas circunst\xE2ncias; veja o GNU Licen\xE7a para o P\xFAblico em Geral no menu Ajuda para detalhes."
-#: Merge.rc:1930
+#: Merge.rc:1927
#, c-format
msgid "&Ok"
msgstr "&Ok"
-#: Merge.rc:1932
+#: Merge.rc:1929
#, c-format
msgid "&Abort"
msgstr "&Abortar"
-#: Merge.rc:1933
+#: Merge.rc:1930
#, c-format
msgid "&Retry"
msgstr "&Tentar de novo"
-#: Merge.rc:1934
+#: Merge.rc:1931
#, c-format
msgid "&Ignore"
msgstr "&Ignorar"
-#: Merge.rc:1935
+#: Merge.rc:1932
#, c-format
msgid "Ignore &all"
msgstr "Ignorar &tudo"
-#: Merge.rc:1936
+#: Merge.rc:1933
#, c-format
msgid "&Yes"
msgstr "&Sim"
-#: Merge.rc:1942
+#: Merge.rc:1939
#, c-format
msgid "Yes to &all"
msgstr "Sim para &todos"
-#: Merge.rc:1943
+#: Merge.rc:1940
#, c-format
msgid "&No"
msgstr "&N\xE3o"
-#: Merge.rc:1944
+#: Merge.rc:1941
#, c-format
msgid "No to a&ll"
msgstr "N\xE3o para t&odos"
-#: Merge.rc:1945
+#: Merge.rc:1942
#, c-format
msgid "&Continue"
msgstr "&Continuar"
-#: Merge.rc:1946
+#: Merge.rc:1943
#, c-format
msgid "&Skip"
msgstr "&Pular"
-#: Merge.rc:1947
+#: Merge.rc:1944
#, c-format
msgid "Skip &all"
msgstr "Pular &tudo"
-#: Merge.rc:1949
+#: Merge.rc:1946
#, c-format
msgid "Don't display this &message again."
msgstr "N\xE3o exibir esta &mensagem de novo."
-#: Merge.rc:1950
+#: Merge.rc:1947
#, c-format
msgid "Don't ask this &question again."
msgstr "N\xE3o perguntar esta &quest\xE3o de novo."
-#: Merge.rc:1961
+#: Merge.rc:1958
#, c-format
msgid "Syntax"
msgstr ""
-#: Merge.rc:1963
+#: Merge.rc:1960
#, c-format
msgid "Version Control"
msgstr "Controle da Vers\xE3o"
-#: Merge.rc:1968
-#: Merge.rc:2339
+#: Merge.rc:1965
+#: Merge.rc:2336
#, c-format
msgid "Differences"
msgstr "Diferen\xE7as"
-#: Merge.rc:1977
+#: Merge.rc:1974
#, c-format
msgid "To:"
msgstr "Para:"
-#: Merge.rc:1978
+#: Merge.rc:1975
#, c-format
msgid "From left:"
msgstr "Da esquerda:"
-#: Merge.rc:1979
+#: Merge.rc:1976
#, c-format
msgid "To left:"
msgstr "Para a esquerda:"
-#: Merge.rc:1980
+#: Merge.rc:1977
#, c-format
msgid "From right:"
msgstr "Da direita:"
-#: Merge.rc:1981
+#: Merge.rc:1978
#, c-format
msgid "To right:"
msgstr "Para a direita:"
-#: Merge.rc:1987
+#: Merge.rc:1984
#, c-format
msgid "Version %1"
msgstr "Vers\xE3o %1"
-#: Merge.rc:1988
+#: Merge.rc:1985
#, c-format
msgid "Unicode"
msgstr "Unicode"
-#: Merge.rc:1989
+#: Merge.rc:1986
#, c-format
msgid "X64"
msgstr "X64"
-#: Merge.rc:1995
+#: Merge.rc:1992
#, c-format
msgid "Options (%1)"
msgstr "Op\xE7\xF5es (%1)"
-#: Merge.rc:1996
+#: Merge.rc:1993
#, c-format
msgid "All message boxes are now displayed again."
msgstr "Todas as caixas de mensagens agora ser\xE3o exibidas de novo."
-#: Merge.rc:1997
+#: Merge.rc:1994
#, 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 "Modifica\xE7\xF5es foram feitas na sess\xE3o de compara\xE7\xE3o do arquivo atual. Algumas configura\xE7\xF5es podem n\xE3o acontecer at\xE9 que a compara\xE7\xE3o do arquivo atual seja reiniciada."
-#: Merge.rc:1998
+#: Merge.rc:1995
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
msgstr "A mudan\xE7a da fonte selecionada n\xE3o ser\xE1 aplicada a qualquer das janelas das diferen\xE7as atualmente vis\xEDveis."
-#: Merge.rc:2000
+#: Merge.rc:1997
#, c-format
msgid ""
"Value in Tab size -field is not in range WinMerge accepts.\n"
@@ -3342,7 +3337,7 @@
"\n"
"Por favor use valores de 1 - %1."
-#: Merge.rc:2002
+#: Merge.rc:1999
#, c-format
msgid ""
"Are you sure you want to reset all WinMerge options to default values?\n"
@@ -3353,129 +3348,129 @@
"\n"
"Por favor reinicie o WinMerge ap\xF3s o reset."
-#: Merge.rc:2008
+#: Merge.rc:2005
#, c-format
msgid "Open"
msgstr "Abrir"
-#: Merge.rc:2009
+#: Merge.rc:2006
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Programas|*.exe;*.bat;*.cmd|Todos os Arquivos (*.*)|*.*||"
-#: Merge.rc:2010
+#: Merge.rc:2007
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr "Todos os Arquivos (*.*)|*.*||"
-#: Merge.rc:2011
+#: Merge.rc:2008
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "Arquivos dos Projetos do WinMerge (*.WinMerge)|*.WinMerge||"
-#: Merge.rc:2013
+#: Merge.rc:2010
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Arquivos das op\xE7\xF5es (*.ini)|*.ini|Todos os Arquivos (*.*)|*.*||"
-#: Merge.rc:2019
+#: Merge.rc:2016
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Arquivos Texto (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Todos os Arquivos (*.*)|*.*||"
-#: Merge.rc:2020
+#: Merge.rc:2017
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "Arquivos HTML (*.htm,*.html)|*.htm;*.html|Todos os Arquivos (*.*)|*.*||"
-#: Merge.rc:2021
+#: Merge.rc:2018
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "Arquivos XML (*.xml)|*.xml|Todos os Arquivos (*.*)|*.*||"
-#: Merge.rc:2027
+#: Merge.rc:2024
#, c-format
msgid "UTF-8"
msgstr "UTF-8"
-#: Merge.rc:2028
+#: Merge.rc:2025
#, c-format
msgid "UTF-8 (B)"
msgstr "UTF-8 (B)"
-#: Merge.rc:2029
+#: Merge.rc:2026
#, c-format
msgid "UCS-2 LE"
msgstr "UCS-2 LE"
-#: Merge.rc:2030
+#: Merge.rc:2027
#, c-format
msgid "UCS-2 BE"
msgstr "UCS-2 BE"
-#: Merge.rc:2036
+#: Merge.rc:2033
#, c-format
msgid "Full Contents"
msgstr "Conte\xFAdos Completos"
-#: Merge.rc:2037
+#: Merge.rc:2034
#, c-format
msgid "Quick Contents"
msgstr "Conte\xFAdos R\xE1pidos"
-#: Merge.rc:2038
+#: Merge.rc:2035
#, c-format
msgid "Modified Date"
msgstr "Data Modificada"
-#: Merge.rc:2039
+#: Merge.rc:2036
#, c-format
msgid "Modified Date and Size"
msgstr "Data e Tamanho Modificados"
-#: Merge.rc:2040
+#: Merge.rc:2037
#, c-format
msgid "Size"
msgstr "Tamanho"
-#: Merge.rc:2046
-#: Merge.rc:2572
+#: Merge.rc:2043
+#: Merge.rc:2569
#, c-format
msgid "Name"
msgstr "Nome"
-#: Merge.rc:2047
+#: Merge.rc:2044
#, c-format
msgid "Location"
msgstr "Local"
-#: Merge.rc:2048
+#: Merge.rc:2045
#, c-format
msgid "Filters"
msgstr "Filtros"
-#: Merge.rc:2049
+#: Merge.rc:2046
#, c-format
msgid "[F] "
msgstr "[F] "
-#: Merge.rc:2050
-#: Merge.rc:2574
+#: Merge.rc:2047
+#: Merge.rc:2571
#, c-format
msgid "Description"
msgstr "Descri\xE7\xE3o"
-#: Merge.rc:2051
+#: Merge.rc:2048
#, c-format
msgid "Select filename for new filter"
msgstr "Selecionar o nome do arquivo para o novo filtro"
-#: Merge.rc:2052
+#: Merge.rc:2049
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Filtros dos Arquivos (*.flt)|*.flt|Todos os Arquivos (*.*)|*.*||"
-#: Merge.rc:2054
+#: Merge.rc:2051
#, c-format
msgid ""
"Cannot find file filter template file!\n"
@@ -3488,7 +3483,7 @@
"Por favor copie o arquivo %1 para a pasta WinMerge/Filtros:\n"
"%2."
-#: Merge.rc:2056
+#: Merge.rc:2053
#, c-format
msgid ""
"Cannot copy filter template file to filter folder:\n"
@@ -3501,7 +3496,7 @@
"\n"
"Por favor tenha certeza de que a pasta exista e \xE9 grav\xE1vel."
-#: Merge.rc:2058
+#: Merge.rc:2055
#, c-format
msgid ""
"User's filter file folder is not defined!\n"
@@ -3512,7 +3507,7 @@
"\n"
"Por favor selecione a pasta do filtro em Op\xE7\xF5es/Sistema."
-#: Merge.rc:2060
+#: Merge.rc:2057
#, c-format
msgid ""
"Failed to delete the filter file:\n"
@@ -3525,12 +3520,12 @@
"\n"
"Talvez o arquivo seja somente-leitura?"
-#: Merge.rc:2061
+#: Merge.rc:2058
#, c-format
msgid "Locate filter file to install"
msgstr "Localizar o filtro do arquivo para instalar"
-#: Merge.rc:2063
+#: Merge.rc:2060
#, c-format
msgid ""
"Installing filter file failed.\n"
@@ -3541,17 +3536,17 @@
"\n"
"N\xE3o p\xF4de copiar o novo arquivo do filtro para a pasta do filtro."
-#: Merge.rc:2065
+#: Merge.rc:2062
#, c-format
msgid "Filter file already exists. Overwrite existing filter?"
msgstr "O arquivo do filtro j\xE1 existe. Sobrescrever o filtro existente?"
-#: Merge.rc:2071
+#: Merge.rc:2068
#, c-format
msgid "Regular expression"
msgstr "Express\xE3o regular"
-#: Merge.rc:2077
+#: Merge.rc:2074
#, c-format
msgid ""
"Filters were updated. Do you want to refresh all open folder compares?\n"
@@ -3562,203 +3557,203 @@
"\n"
"Se voc\xEA n\xE3o quer atualizar todas as compara\xE7\xF5es agora voc\xEA pode selecionar o N\xE3o e atualizar as compara\xE7\xF5es mais tarde."
-#: Merge.rc:2084
+#: Merge.rc:2081
#, c-format
msgid "&Path to SS.EXE:"
msgstr "&Caminho para o SS.EXE:"
-#: Merge.rc:2090
+#: Merge.rc:2087
#, c-format
msgid "Folder Comparison Results"
msgstr "Resultado da Compara\xE7\xE3o dos Pastas"
-#: Merge.rc:2091
+#: Merge.rc:2088
#, c-format
msgid "File Comparison"
msgstr "Compara\xE7\xE3o de Arquivo"
-#: Merge.rc:2092
+#: Merge.rc:2089
#, c-format
msgid "Untitled left"
msgstr "Sem t\xEDtulo a esquerda"
-#: Merge.rc:2093
+#: Merge.rc:2090
#, c-format
msgid "Untitled right"
msgstr "Sem t\xEDtulo a direita"
-#: Merge.rc:2094
+#: Merge.rc:2091
#, c-format
msgid "Theirs File"
msgstr "O Arquivo Deles"
-#: Merge.rc:2095
+#: Merge.rc:2092
#, c-format
msgid "Mine File"
msgstr "Meu Arquivo"
-#: Merge.rc:2101
+#: Merge.rc:2098
#, c-format
msgid "Scanning files..."
msgstr "Escaneando arquivos..."
-#: Merge.rc:2102
+#: Merge.rc:2099
#, c-format
msgid "Opening selection"
msgstr "Abrindo a sele\xE7\xE3o"
-#: Merge.rc:2103
+#: Merge.rc:2100
#, c-format
msgid "Copying Left to Right"
msgstr "Copiando da Esquerda para a Direita"
-#: Merge.rc:2104
+#: Merge.rc:2101
#, c-format
msgid "Copying Right to Left"
msgstr "Copiando da Direita para a Esquerda"
-#: Merge.rc:2105
+#: Merge.rc:2102
#, c-format
msgid "Copying All to Left"
msgstr "Copiando Tudo para a Esquerda"
-#: Merge.rc:2106
+#: Merge.rc:2103
#, c-format
msgid "Copying All to Right"
msgstr "Copiando Tudo para a Direita"
-#: Merge.rc:2107
+#: Merge.rc:2104
#, c-format
msgid "Copying files..."
msgstr "Copiando os arquivos..."
-#: Merge.rc:2108
+#: Merge.rc:2105
#, c-format
msgid "Deleting files..."
msgstr "Apagando os arquivos..."
-#: Merge.rc:2109
+#: Merge.rc:2106
#, c-format
msgid "Moving files..."
msgstr "Movendo os arquivos..."
-#: Merge.rc:2110
+#: Merge.rc:2107
#, c-format
msgid "Creating the report..."
msgstr "Criando o relat\xF3rio..."
-#: Merge.rc:2111
+#: Merge.rc:2108
#, c-format
msgid "Undoing the last operation..."
msgstr "Desfazendo a \xFAltima opera\xE7\xE3o..."
-#: Merge.rc:2112
+#: Merge.rc:2109
#, c-format
msgid "Redoing the previous operation..."
msgstr "Refazendo a opera\xE7\xE3o anterior"
-#: Merge.rc:2118
+#: Merge.rc:2115
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
-#: Merge.rc:2119
+#: Merge.rc:2116
#, c-format
msgid "Line: %s"
msgstr "Linha: %s"
-#: Merge.rc:2120
+#: Merge.rc:2117
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "Ln: %s Col: %d/%d Ch: %d/%d"
-#: Merge.rc:2121
+#: Merge.rc:2118
#, c-format
msgid "Merge"
msgstr "Unir"
-#: Merge.rc:2122
+#: Merge.rc:2119
#, c-format
msgid "Difference %1 of %2"
msgstr "Diferen\xE7a %1 de %2"
-#: Merge.rc:2123
+#: Merge.rc:2120
#, c-format
msgid "%1 Differences Found"
msgstr "%1 Diferen\xE7as Achadas"
-#: Merge.rc:2124
+#: Merge.rc:2121
#, c-format
msgid "1 Difference Found"
msgstr "1 Diferen\xE7a Achada"
#. Abbreviation from "Read Only"
-#: Merge.rc:2125
+#: Merge.rc:2122
#, c-format
msgid "RO"
msgstr "RO"
-#: Merge.rc:2131
+#: Merge.rc:2128
#, c-format
msgid "Item %1 of %2"
msgstr "Item %1 de %2"
-#: Merge.rc:2132
+#: Merge.rc:2129
#, c-format
msgid "Items: %1"
msgstr "Itens: %1"
-#: Merge.rc:2138
+#: Merge.rc:2135
#, c-format
msgid "Select two existing folders or files to compare"
msgstr "Selecione duas pastas ou arquivos existentes para comparar"
-#: Merge.rc:2139
+#: Merge.rc:2136
#, c-format
msgid "Folder Selection"
msgstr "Sele\xE7\xE3o de Pastas"
-#: Merge.rc:2140
+#: Merge.rc:2137
#, c-format
msgid "Select two folders or two files to compare."
msgstr "Selecione duas pastas ou dois arquivos para comparar."
-#: Merge.rc:2141
+#: Merge.rc:2138
#, c-format
msgid "Left path is invalid!"
msgstr "O caminho esquerdo \xE9 inv\xE1lido!"
-#: Merge.rc:2142
+#: Merge.rc:2139
#, c-format
msgid "Right path is invalid!"
msgstr "O caminho direito \xE9 inv\xE1lido!"
-#: Merge.rc:2143
+#: Merge.rc:2140
#, c-format
msgid "Both paths are invalid!"
msgstr "Ambos os caminhos s\xE3o inv\xE1lidos!"
-#: Merge.rc:2144
+#: Merge.rc:2141
#, c-format
msgid "Choose two files to enable unpacker selection."
msgstr "Escolher dois arquivos para ativar a sele\xE7\xE3o do desempacotador."
-#: Merge.rc:2145
+#: Merge.rc:2142
#, c-format
msgid "Cannot compare file and folder!"
msgstr "N\xE3o p\xF4de comparar o arquivo e a pasta!"
-#: Merge.rc:2151
+#: Merge.rc:2148
#, c-format
msgid "File not found: %1"
msgstr "Arquivo n\xE3o achado: %1"
-#: Merge.rc:2152
+#: Merge.rc:2149
#, c-format
msgid "File not unpacked: %1"
msgstr "Arquivo n\xE3o desempacotado: %1"
-#: Merge.rc:2153
+#: Merge.rc:2150
#, c-format
msgid ""
"Cannot open file\n"
@@ -3771,12 +3766,12 @@
"\n"
"%2"
-#: Merge.rc:2154
+#: Merge.rc:2151
#, c-format
msgid "Failed to parse conflict file."
msgstr "Falhou em analisar o arquivo do conflito."
-#: Merge.rc:2155
+#: Merge.rc:2152
#, c-format
msgid ""
"The file\n"
@@ -3787,32 +3782,32 @@
"%1\n"
"n\xE3o \xE9 um arquivo de conflito."
-#: Merge.rc:2161
+#: Merge.rc:2158
#, c-format
msgid "Save As"
msgstr "Salvar Como"
-#: Merge.rc:2162
+#: Merge.rc:2159
#, c-format
msgid "Save changes to %1?"
msgstr "Salvar as mudan\xE7as em %1?"
-#: Merge.rc:2163
+#: Merge.rc:2160
#, 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 est\xE1 marcado como somente-leitura. Voc\xEA gostaria de sobrescrever o arquivo somente-leitura ? (N\xE3o para salvar com um novo nome de arquivo.)"
-#: Merge.rc:2164
+#: Merge.rc:2161
#, c-format
msgid "Error checking destination writeability"
msgstr "Erro ao verificar a habilidade de gravar no destino"
-#: Merge.rc:2165
+#: Merge.rc:2162
#, c-format
msgid "Error backing up file"
msgstr "Erro ao fazer o backup do arquivo"
-#: Merge.rc:2167
+#: Merge.rc:2164
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -3825,7 +3820,7 @@
"\n"
"Continuar de qualquer maneira?"
-#: Merge.rc:2168
+#: Merge.rc:2165
#, c-format
msgid ""
"Saving file failed.\n"
@@ -3842,7 +3837,7 @@
"\t-usar um nome de arquivo diferente (Pressione Ok)\n"
"\t-abortar a opera\xE7\xE3o atual (Pressione Cancelar)?"
-#: Merge.rc:2169
+#: Merge.rc:2166
#, c-format
msgid ""
"Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -3857,7 +3852,7 @@
"\n"
"Voc\xEA quer salvar a vers\xE3o desempacotada em outro arquivo?"
-#: Merge.rc:2170
+#: Merge.rc:2167
#, c-format
msgid ""
"Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -3872,7 +3867,7 @@
"\n"
"Voc\xEA quer salvar a vers\xE3o despachada em outro arquivo?"
-#: Merge.rc:2171
+#: Merge.rc:2168
#, c-format
msgid ""
"Another application has updated file\n"
@@ -3887,7 +3882,7 @@
"\n"
"Sobrescrever o arquivo mudado?"
-#: Merge.rc:2172
+#: Merge.rc:2169
#, c-format
msgid ""
"%1\n"
@@ -3896,7 +3891,7 @@
"%1\n"
"est\xE1 marcado como somente-leitura. Voc\xEA gostaria de sobrescrever o item somente-leitura?"
-#: Merge.rc:2173
+#: Merge.rc:2170
#, c-format
msgid ""
"Another application has updated file\n"
@@ -3911,17 +3906,17 @@
"\n"
"Voc\xEA quer recarregar o arquivo?"
-#: Merge.rc:2174
+#: Merge.rc:2171
#, c-format
msgid "Save Left File As"
msgstr "Salvar o Arquivo a Esquerda Como"
-#: Merge.rc:2175
+#: Merge.rc:2172
#, c-format
msgid "Save Right File As"
msgstr "Salvar o Arquivo a Direita Como"
-#: Merge.rc:2176
+#: Merge.rc:2173
#, c-format
msgid ""
"The file\n"
@@ -3932,7 +3927,7 @@
"%1\n"
"desapareceu. Por favor salve uma c\xF3pia do arquivo para continuar."
-#: Merge.rc:2182
+#: Merge.rc:2179
#, c-format
msgid ""
"Cannot merge differences when documents are not in synch.\n"
@@ -3943,42 +3938,42 @@
"\n"
"Atualize os documentos antes de continuar."
-#: Merge.rc:2188
+#: Merge.rc:2185
#, c-format
msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
msgstr "Voc\xEA deve especificar o caminho de um projeto do SourceSafe para continuar (ex: $/MyProject)"
-#: Merge.rc:2189
+#: Merge.rc:2186
#, c-format
msgid "Checkout files from VSS..."
msgstr "Ver os arquivos da VSS..."
-#: Merge.rc:2190
+#: Merge.rc:2187
#, c-format
msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
msgstr "O Sistema de Vers\xF5es retornou um erro enquanto tentava verificar o arquivo. Incapaz de continuar..."
-#: Merge.rc:2191
+#: Merge.rc:2188
#, c-format
msgid "Error executing versioning system command."
msgstr "Erro ao executar o comando do sistema de vers\xF5es."
-#: Merge....
[truncated message content] |
|
From: <ki...@us...> - 2010-06-19 12:41:59
|
Revision: 7201
http://winmerge.svn.sourceforge.net/winmerge/?rev=7201&view=rev
Author: kimmov
Date: 2010-06-19 12:41:51 +0000 (Sat, 19 Jun 2010)
Log Message:
-----------
Changelog: add recent bug fixes and improvements.
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-06-19 12:23:00 UTC (rev 7200)
+++ trunk/Docs/Users/ChangeLog.txt 2010-06-19 12:41:51 UTC (rev 7201)
@@ -4,13 +4,17 @@
http://winmerge.org/tracker/[tracker-id]
WinMerge 2.13.13
+ Improve editing of linefilter regular expressions (#3015416)
Installer: Embed MS runtime files installer for x64 (r7150)
Installer: Set default language with MSI setup (#3014912)
Bugfix: Compare by size always checked file times too (#2919510)
Bugfix: Line filtering wasted huge amounts of memory (#3014162)
Bugfix: Difference blocks not cleared after merging (#2995925)
+ Bugfix: Wrong time stamp even in generated patch file (#2982964)
+ Bugfix: Ignoring comments wrongly recognized // in strings (#3016907)
New translation: Serbian (#3017674)
Translation updates:
+ - Czech (r7199)
- Japanese (r7153)
WinMerge 2.13.12 - 2010-04-29 (r7148)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-06-19 12:23:07
|
Revision: 7200
http://winmerge.svn.sourceforge.net/winmerge/?rev=7200&view=rev
Author: kimmov
Date: 2010-06-19 12:23:00 +0000 (Sat, 19 Jun 2010)
Log Message:
-----------
Restore changelog line that got removed when backing out patch.
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-06-19 07:40:16 UTC (rev 7199)
+++ trunk/Docs/Users/ChangeLog.txt 2010-06-19 12:23:00 UTC (rev 7200)
@@ -39,6 +39,7 @@
Bugfix: Pane headers not updated after language change (#2923684)
Bugfix: File panes become unaligned when last line didn't have
an EOL byte (#2922517)
+ Bugfix: Automatic rescanning was not disabled everywhere (r7086,r7089)
Bugfix: Quick contents compare didn't ignore EOL byte differences (#2929005)
Translation updates:
- Slovenian (#2917796, #2932094)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ja...@us...> - 2010-06-19 07:40:22
|
Revision: 7199
http://winmerge.svn.sourceforge.net/winmerge/?rev=7199&view=rev
Author: janhryz
Date: 2010-06-19 07:40:16 +0000 (Sat, 19 Jun 2010)
Log Message:
-----------
Update of translation
Modified Paths:
--------------
trunk/Translations/WinMerge/Czech.po
Modified: trunk/Translations/WinMerge/Czech.po
===================================================================
--- trunk/Translations/WinMerge/Czech.po 2010-06-17 20:16:49 UTC (rev 7198)
+++ trunk/Translations/WinMerge/Czech.po 2010-06-19 07:40:16 UTC (rev 7199)
@@ -1545,7 +1545,7 @@
#: Merge.rc:1960
#, c-format
msgid "Text"
-msgstr ""
+msgstr "Text"
#: Merge.rc:939
#, c-format
@@ -2632,12 +2632,12 @@
#: Merge.rc:2307
#, c-format
msgid "Folder"
-msgstr "Slo\x9Eka"
+msgstr "Slo\x9Eky"
#: Merge.rc:1689
#, c-format
msgid "&Compare method:"
-msgstr ""
+msgstr "&Zp\xF9sob porovn\xE1n\xED:"
#: Merge.rc:1691
#, c-format
@@ -2652,12 +2652,12 @@
#: Merge.rc:1695
#, c-format
msgid "&Include unique subfolders contents"
-msgstr ""
+msgstr "Zahrnout obsah jedine\xE8n\xFDch podslo\x9Eek"
#: Merge.rc:1697
#, c-format
msgid "&Quick compare limit (MB):"
-msgstr ""
+msgstr "&Omezen\xED pro rychl\xE9 porovn\xE1n\xED (MB):"
#. StringFileInfo.Block
#: Merge.rc:1723
@@ -3214,7 +3214,7 @@
#: Merge.rc:1961
#, c-format
msgid "Syntax"
-msgstr ""
+msgstr "Syntaxe"
#: Merge.rc:1963
#, c-format
@@ -3225,7 +3225,7 @@
#: Merge.rc:2339
#, c-format
msgid "Differences"
-msgstr "Rozd\xEDl\xF9"
+msgstr "Rozd\xEDly"
#: Merge.rc:1977
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-06-17 20:16:56
|
Revision: 7198
http://winmerge.svn.sourceforge.net/winmerge/?rev=7198&view=rev
Author: gerundt
Date: 2010-06-17 20:16:49 +0000 (Thu, 17 Jun 2010)
Log Message:
-----------
PATCH: [ 3017674 ] New Serbian Language - Add ShellExtension changes
Modified Paths:
--------------
trunk/ShellExtension/ShellExtension.rc
trunk/ShellExtension/ShellExtension.vcproj
trunk/ShellExtension/ShellExtensionX64.vcproj
Added Paths:
-----------
trunk/ShellExtension/Languages/ShellExtensionSerbian.rc
trunk/Translations/ShellExtension/Serbian.po
Added: trunk/ShellExtension/Languages/ShellExtensionSerbian.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionSerbian.rc (rev 0)
+++ trunk/ShellExtension/Languages/ShellExtensionSerbian.rc 2010-06-17 20:16:49 UTC (rev 7198)
@@ -0,0 +1,54 @@
+//Microsoft Developer Studio generated resource script.
+//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+// ..\..\Translations\ShellExtension\<Languagename>.po
+//
+// $Id$
+
+#include "../resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SER)
+#ifdef _WIN32
+LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC
+#pragma code_page(1251)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
+STRINGTABLE
+BEGIN
+ IDS_PROJNAME "ShellExtension"
+ IDS_CONTEXT_MENU "WinMerge"
+ IDS_CONTEXT_HELP "Open with WinMerge"
+ IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 2 items"
+ IDS_COMPARE "Compare"
+ IDS_COMPARE_ELLIPSIS "Compare..."
+ IDS_COMPARE_TO "Compare To"
+ IDS_HELP_SAVETHIS "Save this path. Select another path to compare with this path."
+ IDS_HELP_COMPARESAVED "Compare to saved path (%1)"
+ IDS_RESELECT_FIRST "Re-select First"
+END
+
+#endif // Resources
+/////////////////////////////////////////////////////////////////////////////
Property changes on: trunk/ShellExtension/Languages/ShellExtensionSerbian.rc
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/ShellExtension/ShellExtension.rc
===================================================================
--- trunk/ShellExtension/ShellExtension.rc 2010-06-17 19:37:02 UTC (rev 7197)
+++ trunk/ShellExtension/ShellExtension.rc 2010-06-17 20:16:49 UTC (rev 7198)
@@ -228,6 +228,14 @@
"#endif //_WIN32\r\n"
"#endif\r\n"
"\r\n"
+ "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SER)\r\n"
+ "#ifdef _WIN32\r\n"
+ "LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC\r\n"
+ "#pragma code_page(1251)\r\n"
+ "#include ""Languages\\ShellExtensionSerbian.rc""\r\n"
+ "#endif //_WIN32\r\n"
+ "#endif\r\n"
+ "\r\n"
"#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SKY)\r\n"
"#ifdef _WIN32\r\n"
"LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT\r\n"
Modified: trunk/ShellExtension/ShellExtension.vcproj
===================================================================
--- trunk/ShellExtension/ShellExtension.vcproj 2010-06-17 19:37:02 UTC (rev 7197)
+++ trunk/ShellExtension/ShellExtension.vcproj 2010-06-17 20:16:49 UTC (rev 7198)
@@ -6860,6 +6860,170 @@
</FileConfiguration>
</File>
<File
+ RelativePath="Languages\ShellExtensionSerbian.rc"
+ >
+ <FileConfiguration
+ Name="Unicode Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Debug|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinSize|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinSize|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinDependency|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinDependency|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinSize|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinSize|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="Languages\ShellExtensionSlovak.rc"
>
<FileConfiguration
Modified: trunk/ShellExtension/ShellExtensionX64.vcproj
===================================================================
--- trunk/ShellExtension/ShellExtensionX64.vcproj 2010-06-17 19:37:02 UTC (rev 7197)
+++ trunk/ShellExtension/ShellExtensionX64.vcproj 2010-06-17 20:16:49 UTC (rev 7198)
@@ -1019,6 +1019,30 @@
</FileConfiguration>
</File>
<File
+ RelativePath="Languages\ShellExtensionSerbian.rc"
+ >
+ <FileConfiguration
+ Name="Debug X64|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release X64|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="Languages\ShellExtensionSlovak.rc"
>
<FileConfiguration
Added: trunk/Translations/ShellExtension/Serbian.po
===================================================================
--- trunk/Translations/ShellExtension/Serbian.po (rev 0)
+++ trunk/Translations/ShellExtension/Serbian.po 2010-06-17 20:16:49 UTC (rev 7198)
@@ -0,0 +1,89 @@
+# This file is part from WinMerge <http://winmerge.org/>
+# Released under the "GNU General Public License"
+#
+# ID line follows -- this is updated by SVN
+# $Id$
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: WinMerge Shell Extension\n"
+"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
+"POT-Creation-Date: 2009-07-26 14:36+0000\n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: English <win...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CP1251\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Serbian\n"
+"X-Poedit-SourceCharset: CP1252\n"
+"X-Poedit-Basepath: ../../ShellExtension/Languages/\n"
+
+#. AFX_TARG_*
+#: ShellExtensionTemplate.rc:24
+#, c-format
+msgid "AFX_TARG_ENU"
+msgstr "AFX_TARG_SER"
+
+#. LANGUAGE, SUBLANGUAGE
+#: ShellExtensionTemplate.rc:26
+#, c-format
+msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
+msgstr "LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC"
+
+#. Codepage
+#: ShellExtensionTemplate.rc:27
+#, c-format
+msgid "1252"
+msgstr "1251"
+
+#: ShellExtensionTemplate.rc:41
+#, c-format
+msgid "ShellExtension"
+msgstr "ShellExtension"
+
+#: ShellExtensionTemplate.rc:42
+#, c-format
+msgid "WinMerge"
+msgstr "WinMerge"
+
+#: ShellExtensionTemplate.rc:43
+#, c-format
+msgid "Open with WinMerge"
+msgstr ""
+
+#: ShellExtensionTemplate.rc:44
+#, c-format
+msgid "Please select no more than 2 items"
+msgstr ""
+
+#: ShellExtensionTemplate.rc:45
+#, c-format
+msgid "Compare"
+msgstr ""
+
+#: ShellExtensionTemplate.rc:46
+#, c-format
+msgid "Compare..."
+msgstr ""
+
+#: ShellExtensionTemplate.rc:47
+#, c-format
+msgid "Compare To"
+msgstr ""
+
+#: ShellExtensionTemplate.rc:48
+#, c-format
+msgid "Save this path. Select another path to compare with this path."
+msgstr ""
+
+#: ShellExtensionTemplate.rc:49
+#, c-format
+msgid "Compare to saved path (%1)"
+msgstr ""
+
+#: ShellExtensionTemplate.rc:50
+#, c-format
+msgid "Re-select First"
+msgstr ""
+
Property changes on: trunk/Translations/ShellExtension/Serbian.po
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-06-17 19:37:10
|
Revision: 7197
http://winmerge.svn.sourceforge.net/winmerge/?rev=7197&view=rev
Author: gerundt
Date: 2010-06-17 19:37:02 +0000 (Thu, 17 Jun 2010)
Log Message:
-----------
PATCH: [ 3017674 ] New Serbian Language
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Docs/Users/Contributors.txt
trunk/Installer/InnoSetup/WinMerge.iss
trunk/Installer/WiX/Fragments/Features.wxs
trunk/Installer/WiX/Fragments/Languages.wxs
trunk/Translations/InnoSetup/Brazilian_Portuguese.isl
trunk/Translations/InnoSetup/Bulgarian.isl
trunk/Translations/InnoSetup/Catalan.isl
trunk/Translations/InnoSetup/Chinese_Simplified.isl
trunk/Translations/InnoSetup/Chinese_Traditional.isl
trunk/Translations/InnoSetup/Croatian.isl
trunk/Translations/InnoSetup/Czech.isl
trunk/Translations/InnoSetup/Danish.isl
trunk/Translations/InnoSetup/Dutch.isl
trunk/Translations/InnoSetup/English.isl
trunk/Translations/InnoSetup/French.isl
trunk/Translations/InnoSetup/Galician.isl
trunk/Translations/InnoSetup/German.isl
trunk/Translations/InnoSetup/Greek.isl
trunk/Translations/InnoSetup/Hungarian.isl
trunk/Translations/InnoSetup/Italian.isl
trunk/Translations/InnoSetup/Japanese.isl
trunk/Translations/InnoSetup/Korean.isl
trunk/Translations/InnoSetup/Norwegian.isl
trunk/Translations/InnoSetup/Persian.isl
trunk/Translations/InnoSetup/Polish.isl
trunk/Translations/InnoSetup/Portuguese.isl
trunk/Translations/InnoSetup/Romanian.isl
trunk/Translations/InnoSetup/Russian.isl
trunk/Translations/InnoSetup/Slovak.isl
trunk/Translations/InnoSetup/Slovenian.isl
trunk/Translations/InnoSetup/Spanish.isl
trunk/Translations/InnoSetup/Swedish.isl
trunk/Translations/InnoSetup/Turkish.isl
trunk/Translations/InnoSetup/Ukrainian.isl
Added Paths:
-----------
trunk/Translations/Docs/Readme/ReadMe-Serbian.txt
trunk/Translations/InnoSetup/Serbian.isl
trunk/Translations/WinMerge/Serbian.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Docs/Users/ChangeLog.txt 2010-06-17 19:37:02 UTC (rev 7197)
@@ -9,6 +9,7 @@
Bugfix: Compare by size always checked file times too (#2919510)
Bugfix: Line filtering wasted huge amounts of memory (#3014162)
Bugfix: Difference blocks not cleared after merging (#2995925)
+ New translation: Serbian (#3017674)
Translation updates:
- Japanese (r7153)
Modified: trunk/Docs/Users/Contributors.txt
===================================================================
--- trunk/Docs/Users/Contributors.txt 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Docs/Users/Contributors.txt 2010-06-17 19:37:02 UTC (rev 7197)
@@ -110,6 +110,9 @@
* Russian:
Dmitriy S. Aleshkowskiy <wwa...@ma...>
+* Serbian:
+ Ozzii <iva...@gm...>
+
* Slovak:
Majvan <van...@de...>
Ivan Mas\xE1r <he...@ce...>
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2010-06-17 19:37:02 UTC (rev 7197)
@@ -139,6 +139,7 @@
Name: PortugueseBrazilian; MessagesFile: ..\..\Translations\InnoSetup\Brazilian_Portuguese.isl; InfoAfterFile: ..\..\Translations\Docs\Readme\ReadMe-Brazilian.txt
Name: Romanian; MessagesFile: ..\..\Translations\InnoSetup\Romanian.isl
Name: Russian; MessagesFile: ..\..\Translations\InnoSetup\Russian.isl
+Name: Serbian; MessagesFile: ..\..\Translations\InnoSetup\Serbian.isl InfoAfterFile: ..\..\Translations\Docs\Readme\ReadMe-Serbian.txt
Name: Slovak; MessagesFile: ..\..\Translations\InnoSetup\Slovak.isl
Name: Slovenian; MessagesFile: ..\..\Translations\InnoSetup\Slovenian.isl
Name: Spanish; MessagesFile: ..\..\Translations\InnoSetup\Spanish.isl; InfoAfterFile: ..\..\Translations\Docs\Readme\ReadMe-Spanish.txt
@@ -239,6 +240,9 @@
Name: Languages\Russian; Description: {cm:RussianLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Russian
Name: Languages\Russian; Description: {cm:RussianLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Russian
+Name: Languages\Serbian; Description: {cm:SerbianLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Serbian
+Name: Languages\Serbian; Description: {cm:SerbianLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Serbian
+
Name: Languages\Slovak; Description: {cm:SlovakLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Slovak
Name: Languages\Slovak; Description: {cm:SlovakLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Slovak
@@ -308,6 +312,7 @@
Name: {app}\Languages\MergeSlovak.lang; Type: files
Name: {app}\Languages\MergeSpanish.lang; Type: files
Name: {app}\Languages\MergeRussian.lang; Type: files
+Name: {app}\Languages\MergeSerbian.lang; Type: files
Name: {app}\Languages\MergeSwedish.lang; Type: files
Name: {app}\Languages\MergeTurkish.lang; Type: files
Name: {app}\MergePlugins\list.txt; Type: files; Check: not IsComponentSelected('Plugins')
@@ -417,6 +422,7 @@
Source: ..\..\Translations\WinMerge\Romanian.po; DestDir: {app}\Languages; Components: Languages\Romanian; Flags: ignoreversion comparetimestamp
Source: ..\..\Translations\Docs\Readme\ReadMe-Romanian.txt; DestDir: {app}\Docs; Components: Languages\Romanian
Source: ..\..\Translations\WinMerge\Russian.po; DestDir: {app}\Languages; Components: Languages\Russian; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\WinMerge\Serbian.po; DestDir: {app}\Languages; Components: Languages\Serbian; Flags: ignoreversion comparetimestamp
Source: ..\..\Translations\WinMerge\Slovak.po; DestDir: {app}\Languages; Components: Languages\Slovak; Flags: ignoreversion comparetimestamp
Source: ..\..\Translations\WinMerge\Slovenian.po; DestDir: {app}\Languages; Components: Languages\Slovenian; Flags: ignoreversion comparetimestamp
Source: ..\..\Translations\WinMerge\Spanish.po; DestDir: {app}\Languages; Components: Languages\Spanish; Flags: ignoreversion comparetimestamp
@@ -558,6 +564,7 @@
Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000416; Flags: deletevalue; Languages: PortugueseBrazilian
Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000418; Flags: deletevalue; Languages: Romanian
Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000419; Flags: deletevalue; Languages: Russian
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000c1a; Flags: deletevalue; Languages: Serbian
Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $0000041b; Flags: deletevalue; Languages: Slovak
Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000c0a; Flags: deletevalue; Languages: Spanish
Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $0000041D; Flags: deletevalue; Languages: Swedish
Modified: trunk/Installer/WiX/Fragments/Features.wxs
===================================================================
--- trunk/Installer/WiX/Fragments/Features.wxs 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Installer/WiX/Fragments/Features.wxs 2010-06-17 19:37:02 UTC (rev 7197)
@@ -73,6 +73,7 @@
<ComponentRef Id="Portuguese" />
<ComponentRef Id="Romanian" />
<ComponentRef Id="Russian" />
+ <ComponentRef Id="Serbian" />
<ComponentRef Id="Slovak" />
<ComponentRef Id="Slovenian" />
<ComponentRef Id="Spanish" />
Modified: trunk/Installer/WiX/Fragments/Languages.wxs
===================================================================
--- trunk/Installer/WiX/Fragments/Languages.wxs 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Installer/WiX/Fragments/Languages.wxs 2010-06-17 19:37:02 UTC (rev 7197)
@@ -164,6 +164,13 @@
Vital="no" />
</Component>
+ <Component Id="Serbian" Guid="*" Win64="$(var.Win64)">
+ <File Id="SerbianPO"
+ Name="Serbian.po"
+ Source="..\..\Translations\WinMerge\Serbian.po"
+ Vital="no" />
+ </Component>
+
<Component Id="Slovak" Guid="*" Win64="$(var.Win64)">
<File Id="SlovakPO"
Name="Slovak.po"
Added: trunk/Translations/Docs/Readme/ReadMe-Serbian.txt
===================================================================
--- trunk/Translations/Docs/Readme/ReadMe-Serbian.txt (rev 0)
+++ trunk/Translations/Docs/Readme/ReadMe-Serbian.txt 2010-06-17 19:37:02 UTC (rev 7197)
@@ -0,0 +1,60 @@
+WINMERGE
+
+WinMerge \xBC\xE5 \xEF\xF0\xEE\xE3\xF0\xE0\xEC \xEE\xF2\xE2\xEE\xF0\xE5\xED\xEE\xE3 \xEA\xEE\xE4\xE0 \xE7\xE0 \xEF\xEE\xF0\xE5\x90\xE5\x9C\xE5 \xE8 \xF1\xEF\xE0\xBC\xE0\x9C\xE5 \xE7\xE0 Windows '\xCE\xD1/. WinMerge \xEC\xEE\xE6\xE5
+\xEF\xEE\xF0\xE5\xE4\xE8\xF2\xE8 \xE8 \xE4\xE0\xF2\xEE\xF2\xE5\xEA\xE5 \xE8 \xF4\xE0\xF1\xF6\xE8\xEA\xEB\xE5, \xEF\xF0\xE8\xEA\xE0\xE7\xF3\xBC\xE5 \xE8 \xE8\xF1\xF2\xE8\xF7\xE5 \xF0\xE0\xE7\xEB\xE8\xEA\xE5 \xF2\xE5\xEA\xF1\xF2\xE0 \xE8 \xF1\xE0 \x9C\xE8\xEC\xE5 \xF1\xE5 \xEB\xE0\xEA\xEE \xF0\xF3\xEA\xF3\xBC\xE5.
+ WinMerge \xF1\xE5 \xEC\xEE\xE6\xE5 \xEA\xEE\xF0\xE8\xF1\xF2\xE8\xF2\xE8 \xEA\xE0\xEE \xF1\xEF\xEE\x9A\xED\xE8 \xE8\xEB\xE8 \xF1\xE0\xEC\xEE\xF1\xF2\xE0\xEB\xED\xE8 \xEF\xF0\xEE\xE3\xF0\xE0\xEC \xE7\xE0 \xEF\xEE\xF0\xE5\x90\xE5\x9C\xE5/\xF1\xEF\xE0\xBC\xE0\x9C\xE5.
+
+
+WinMerge \xE8\xEC\xE0 \xE4\xEE\xF1\xF2\xE0 \xEA\xEE\xF0\xE8\xF1\xED\xE8\xF5 \xF4\xF3\xED\xEA\xF6\xE8\xBC\xE0 \xEA\xEE\xBC\xE0 \xEE\xEC\xEE\xE3\xF3\x9E\xF3\xBC\xF3 \xEF\xEE\xF0\xE5\x90\xE5\x9C\xE5, \xF3\xEF\xE0\xF0\xE0\x90\xE8\xE2\xE0\x9C\xE5,
+\xE8 \xF1\xEF\xE0\xBC\xE0\x9C\xE5 \xED\xE0 \xBC\xE5\xE4\xED\xEE\xF1\xF2\xE0\xE2\xE0\xED \xED\xE0\xF7\xE8\xED. \xC7\xE0 \xED\xE5\xEA\xEE\xEB\xE8\xEA\xEE \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xF1\xEA\xE8\xF5 \xBC\xE5\xE7\xE8\xEA\xE0 \xE8
+\xE8 \xE4\xF0\xF3\xE3\xE8\xF5 \xE2\xF0\xF1\xF2\xE0 \xE4\xE0\xF2\xEE\xF2\xE5\xEA\xE0 \xE8\xF1\xF2\xE8\xF7\xE5 \xF2\xE0\xF7\xE0\xED \xF1\xEA\xEB\xEE\xEF \xF0\xE5\xF7\xE8.
+
+\xCF\xEE\xF1\xEB\xE5\xE4\x9C\xE5 WinMerge \xE8\xE7\xE4\xE0\x9C\xE5 \xE8 WinMerge \xEE\xE1\xE0\xE2\xE5\xF8\xF2\xE5\x9C\xE5 \xE4\xEE\xF1\xF2\xF3\xEF\xED\xEE \xBC\xE5 \xED\xE0
+http://winmerge.org/.
+
+\xC1\xF0\xE7\xE8 \xEF\xEE\xF7\xE5\xF2\xE0\xEA
+===========
+\xC4\xE0 \xE1\xE8 \xF1\xF2\xE5 \xF1\xE0\xE7\xED\xE0\xEB\xE8 \xEA\xE0\xEA\xEE \xE4\xE0 \xEA\xEE\xF0\xE8\xF1\xF2\xE8\xF2\xE5 WinMerge, \xEA\xEB\xE8\xEA\xED\xE8\xF2\xE5 \xED\xE0 \xE4\xF3\xE3\xEC\xE5
+'\xCF\xEE\xEC\xEE\x9E' \xE8 \xE8\xE4\xE8\xF2\xE5 \xED\xE0 Quick start \xE8\xEB\xE8 \xE8\xE4\xE8\xF2\xE5 \xED\xE0 \xE8\xED\xF2\xE5\xF0\xED\xE5\xF2 \xE8 \xEF\xEE\xF1\xE5\xF2\xE8\xF2\xE5
+ http://winmerge.org/docs/manual/QuickStart.html.
+
+WinMerge \xCF\xEE\xEC\xEE\x9E
+=============
+WinMerge \xCF\xEE\xEC\xEE\x9E \xBC\xE5 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xED \xEA\xE0\xEE Microsoft HTML Help \xE4\xE0\xF2\xEE\xF2\xE5\xEA\xE0 \xED\xE0\xE7\xE8\xE2\xE0 WinMerge.chm,
+\xF3 \xF4\xE0\xF1\xF6\xE8\xEA\xEB\xE8 WinMerge. \xCE\xF2\xE2\xE0\xF0\xE0 \xF1\xE5 \xEA\xEB\xE8\xEA\xEE\xEC \xED\xE0 \xCF\xEE\xEC\xEE\x9E >WinMerge Help \xE8\xEB\xE8 \xED\xE0 \xF2\xE0\xF1\xF2\xE5\xF0 F1 \xF3
+ WinMerge \xEF\xF0\xEE\xE7\xEE\xF0\xF3. \xCD\xE0 \xEA\xEE\xEC\xE0\xED\xE4\xED\xEE\xBC \xEB\xE8\xED\xE8\xBC\xE8 \xEF\xEE\xEA\xF0\xE5\x9E\xE5 \xF1\xE5 \xED\xE0\xF0\xE5\xE4\xE1\xEE\xEC /? help switch.
+
+
+\xD2\xE0\xEA\xEE\x90\xE5 \xEC\xEE\xE6\xE5\xF2\xE5 \xEF\xF0\xE5\xE3\xEB\xE5\xE4\xE0\xF2\xE8 WinMerge Help \xED\xE0 \xF1\xEB\xE5\xE4\xE5\x9E\xEE\xBC \xE0\xE4\xF0\xE5\xF1\xE8
+http://winmerge.org/docs/manual/.
+
+\xCF\xEE\xE4\xF0\xF8\xEA\xE0 \xE0\xF0\xF5\xE8\xE2\xE0
+===============
+WinMerge \xEA\xEE\xF0\xE8\xF1\xF2\xE8 7-Zip (http://www.7-zip.org) \xE0\xF0\xF5\xE8\xE2\xE5\xF0 \xEE\xF2\xE2\xEE\xF0\xE5\xED\xEE\xE3 \xEA\xEE\xE4\xE0
+\xCF\xF0\xE5\xEF\xEE\xF0\xF3\xF7\xF3\xBC\xE5\xEC\xEE \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\x9C\xE5 7-Zip \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE0 \xE8 \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xF1\xEA\xEE\xE3 \xE4\xEE\xE4\xE0\xF2\xEA\xE0 \xF1\xE0 \xF1\xEB\xE5\xE4\xE5\x9E\xE5 \xE0\xE4\xF0\xE5\xF1\xE5:
+http://winmerge.org/downloads/.
+
+\xC0\xEA\xEE \xED\xE5 \xEC\xEE\xE6\xE5\xF2\xE5 \xE4\xE0 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xF2\xE5 7-Zip \xE8\xE7 \xE1\xE8\xEB\xEE \xEA\xEE\xE3 \xF0\xE0\xE7\xEB\xEE\xE3\xE0, \xEA\xEE\xF0\xE8\xF1\xF2\xE8\xF2\xE5 7-zip
+\xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xEE\xED\xE8 \xE4\xEE\xE4\xE0\xF2\xE0\xEAr \xEA\xEE\xBC\xE8 \x9E\xE5 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xF2\xE8 \xF1\xE0\xEC\xEE \xEF\xEE\xF2\xF0\xE5\xE1\xED\xE5 \xE4\xE0\xF2\xEE\xF2\xE5\xEA\xE5 \xEF\xEE\xE4\xF0\xF8\xEA\xE5.
+\xC2\xE8\xF8\xE5 \xEE \xF2\xEE\xEC\xE5 \xEF\xEE\xE3\xEB\xE5\xE4\xE0\xBC\xF2\xE5 \xF3 \xEF\xEE\xEC\xEE\x9E\xE8 \xEF\xEE\xE3\xEB\xE0\xE2\x9A\xE5, "7-Zip and archive support".
+
+WinMerge \xCF\xEE\xE4\xF0\xF8\xEA\xE0
+================
+\xCF\xE8\xF2\xE0\x9C\xE0 \xE8 \xF1\xF3\xE3\xE5\xF1\xF2\xE8\xBC\xE5 \xEE WinMerge? \xCF\xF0\xE0\xE2\xEE \xEC\xE5\xF1\xF2\xEE \xE7\xE0 \xEF\xEE\xF7\xE5\xF2\xE0\xEA \xBC\xE5 the WinMerge
+\xE7\xE0\xBC\xE5\xE4\xED\xE8\xF7\xEA\xE8 \xF4\xEE\xF0\xF3\xEC \xED\xE0 http://forums.winmerge.org/. \xCF\xF0\xEE\xE3\xF0\xE0\xEC\xE5\xF0\xE8 \xF7\xE5\xF1\xF2\xEE \xF7\xE8\xF2\xE0\xBC\xF3 \xE8 \xEE\xE4\xE3\xEE\xE2\xE0\xF0\xE0\xBC\xF3 \xED\xE0 \xEF\xE8\xF2\xE0\x9C\xE0
+\xCA\xEE\xF0\xE8\xF1\xF2\xE8\xF2\xE5 Open Discussion \xF4\xEE\xF0\xF3\xEC \xE7\xE0 \xEE\xEF\xF8\xF2\xE0 WinMerge \xEF\xE8\xF2\xE0\x9C\xE0, \xEA\xE0\xEE \xF8\xF2\xEE \xF1\xF3 \xEF\xE8\xF2\xE0\x9C\xE0 \xEE \xEA\xEE\xF0\xE8\xF8\x9E\xE5\x9C\xF3. \xCA\xEE\xF0\xE8\xF1\xF2\xE8\xF2\xE5 '\xCF\xF0\xEE\xE3\xF0\xE0\xEC\xE5\xF0\xF1\xEA\xE8 \xF4\xEE\xF0\xF3\xEC'
+\xE7\xE0 WinMerge \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE5\xF0\xF1\xEA\xE0 \xEF\xE8\xF2\xE0\x9C\xE0.
+
+\xC3\xF0\xE5\xF8\xEA\xE5 \xE8 \xE6\xE5\x9A\xE5\xED\xE0 \xF1\xE2\xEE\xBC\xF1\xF2\xE2\xE0
+=========================
+\xC0\xEA\xEE \xEF\xF0\xEE\xE1\xEB\xE5\xEC \xED\xE5 \xE1\xF3\xE4\xE5 \xF0\xE5\xF8\xE5\xED \xF3 WinMerge \xF4\xEE\xF0\xF3\xEC\xF3,\xEE\xE4\xE0\xE1\xE5\xF0\xE8\xF2\xE5 \xEF\xF0\xE5\xF2\xF0\xE0\xE3\xF3 \xED\xE0
+ http://project.winmerge.org/, \xE8 \xEA\xEB\xE8\xEA\xED\xE8\xF2\xE5 \xED\xE0 \xE6\xE5\x9A\xE5\xED\xEE \xF1\xE0 \xE8\xE7\xE1\xEE\xF0\xED\xE8\xEA\xE0, \xED\xEF\xF0 \xE3\xF0\xE5\xF8\xEA\xE0 \xE8\xEB\xE8
+'\xCE\xE1\xEB\xE8\xEA \xF2\xF0\xE0\xE6\xE5\x9C\xE0', \xE8 \xEF\xEE\xE3\xEB\xE5\xE4\xE0\xBC\xF2\xE5 \xE2\xE5\x9E \xEF\xEE\xF1\xF2\xEE\xBC\xE5\x9E\xE5 \xEE\xE4\xE3\xEE\xE2\xEE\xF0\xE5..
+
+\xC0\xEA\xEE \xEF\xEE\xF8\xE0\x9A\xE5\xF2\xE5 \xE3\xF0\xE5\xF8\xEA\xF3, \xEC\xEE\xEB\xE8\xEC \xC2\xE0\xF1 \xED\xE0\xE2\xE5\xE4\xE8\xF2\xE5 \xE1\xF0\xEE\xBC \xE8\xE7\xE4\xE0\x9C\xE0 WinMerge \xEA\xEE\xBC\xF3 \xEA\xEE\xF0\xE8\xF1\xF2\xE8\xF2\xE5.
+\xCC\xEE\xE6\xE5\xF2\xE5 \xF3\xEA\x9A\xF3\xF7\xE8\xF2\xE8 \xEF\xEE\xF1\xF2\xE0\xE2\xEA\xE5 \xE0\xEA\xEE \xEA\xEB\xE8\xEA\xED\xE5\xF2\xE5 \xED\xE0 \xCF\xEE\xEC\xEE\x9E>\xCF\xEE\xF1\xF2\xE0\xE2\xEA\xE5.
+\xD3\xE7 \xE8\xE7\xE2\xE5\xF8\xF2\xE0\xBC \xEE \xE3\xF0\xE5\xF8\xF6\xE8 \xEF\xF0\xE8\xEB\xEE\xE6\xE8\xF2\xE5 \xE8 \xE7\xE0\xEF\xE8\xF1 \xEE \xEF\xEE\xF1\xF2\xE0\xE2\xEA\xE0\xEC\xE0; \xE8\xEC\xE0 \xEF\xF3\xED\xEE \xEA\xEE\xF0\xE8\xF1\xED\xE8\xF5
+\xEE\xE1\xE0\xE2\xE5\xF8\xF2\xE5\x9C\xE0 \xE7\xE0 \xED\xE0\xF1 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE5\xF0\xE5.
+
+
+- The WinMerge \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE5\xF0\xE8
Property changes on: trunk/Translations/Docs/Readme/ReadMe-Serbian.txt
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/Translations/InnoSetup/Brazilian_Portuguese.isl
===================================================================
--- trunk/Translations/InnoSetup/Brazilian_Portuguese.isl 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Translations/InnoSetup/Brazilian_Portuguese.isl 2010-06-17 19:37:02 UTC (rev 7197)
@@ -357,6 +357,7 @@
PortugueseLanguage=Menus e di\xE1logos portugueses
RomanianLanguage=Menus e di\xE1logos romenos
RussianLanguage=Menus e di\xE1logos russos
+SerbianLanguage=Serbian menus and dialogs
SlovakLanguage=Menus e di\xE1logos eslovacos
SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Menus e di\xE1logos espanh\xF3is
Modified: trunk/Translations/InnoSetup/Bulgarian.isl
===================================================================
--- trunk/Translations/InnoSetup/Bulgarian.isl 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Translations/InnoSetup/Bulgarian.isl 2010-06-17 19:37:02 UTC (rev 7197)
@@ -359,6 +359,7 @@
PortugueseLanguage=Portuguese menus and dialogs
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
+SerbianLanguage=Serbian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
Modified: trunk/Translations/InnoSetup/Catalan.isl
===================================================================
--- trunk/Translations/InnoSetup/Catalan.isl 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Translations/InnoSetup/Catalan.isl 2010-06-17 19:37:02 UTC (rev 7197)
@@ -342,6 +342,7 @@
PortugueseLanguage=Men\xFAs i di\xE0legs en Portugu\xE8s
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Men\xFAs i di\xE0legs en Rus
+SerbianLanguage=Serbian menus and dialogs
SlovakLanguage=Men\xFAs i di\xE0legs en Eslovac
SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Men\xFAs i di\xE0legs en Castell\xE0
Modified: trunk/Translations/InnoSetup/Chinese_Simplified.isl
===================================================================
--- trunk/Translations/InnoSetup/Chinese_Simplified.isl 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Translations/InnoSetup/Chinese_Simplified.isl 2010-06-17 19:37:02 UTC (rev 7197)
@@ -349,6 +349,7 @@
PortugueseLanguage=Portuguese menus and dialogs
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
+SerbianLanguage=Serbian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
Modified: trunk/Translations/InnoSetup/Chinese_Traditional.isl
===================================================================
--- trunk/Translations/InnoSetup/Chinese_Traditional.isl 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Translations/InnoSetup/Chinese_Traditional.isl 2010-06-17 19:37:02 UTC (rev 7197)
@@ -356,6 +356,7 @@
PortugueseLanguage=Portuguese menus and dialogs
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
+SerbianLanguage=Serbian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
Modified: trunk/Translations/InnoSetup/Croatian.isl
===================================================================
--- trunk/Translations/InnoSetup/Croatian.isl 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Translations/InnoSetup/Croatian.isl 2010-06-17 19:37:02 UTC (rev 7197)
@@ -352,6 +352,7 @@
PortugueseLanguage=Portuguese menus and dialogs
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
+SerbianLanguage=Serbian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
Modified: trunk/Translations/InnoSetup/Czech.isl
===================================================================
--- trunk/Translations/InnoSetup/Czech.isl 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Translations/InnoSetup/Czech.isl 2010-06-17 19:37:02 UTC (rev 7197)
@@ -357,6 +357,7 @@
PortugueseLanguage=Portuguese menus and dialogs
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
+SerbianLanguage=Serbian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
Modified: trunk/Translations/InnoSetup/Danish.isl
===================================================================
--- trunk/Translations/InnoSetup/Danish.isl 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Translations/InnoSetup/Danish.isl 2010-06-17 19:37:02 UTC (rev 7197)
@@ -358,6 +358,7 @@
PortugueseLanguage=Portuguese menus and dialogs
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
+SerbianLanguage=Serbian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
Modified: trunk/Translations/InnoSetup/Dutch.isl
===================================================================
--- trunk/Translations/InnoSetup/Dutch.isl 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Translations/InnoSetup/Dutch.isl 2010-06-17 19:37:02 UTC (rev 7197)
@@ -336,6 +336,7 @@
PortugueseLanguage=Portugese menu\x92s en vensters
RomanianLanguage=Roemeense menu\x92s en vensters
RussianLanguage=Russische menu\x92s en vensters
+SerbianLanguage=Serbian menus and dialogs
SlovakLanguage=Slovaakse menu\x92s en vensters
SlovenianLanguage=Sloveense menu\x92s en vensters
SpanishLanguage=Spaanse menu\x92s en vensters
Modified: trunk/Translations/InnoSetup/English.isl
===================================================================
--- trunk/Translations/InnoSetup/English.isl 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Translations/InnoSetup/English.isl 2010-06-17 19:37:02 UTC (rev 7197)
@@ -359,6 +359,7 @@
PortugueseLanguage=Portuguese menus and dialogs
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
+SerbianLanguage=Serbian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
Modified: trunk/Translations/InnoSetup/French.isl
===================================================================
--- trunk/Translations/InnoSetup/French.isl 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Translations/InnoSetup/French.isl 2010-06-17 19:37:02 UTC (rev 7197)
@@ -351,6 +351,7 @@
PortugueseLanguage=Menus et dialogues Portugais
RomanianLanguage=Menus et dialogues Roumain
RussianLanguage=Menus et dialogues Russe
+SerbianLanguage=Serbian menus and dialogs
SlovakLanguage=Menus et dialogues Slovaque
SlovenianLanguage=Menus et dialogues Slov\xE8ne
SpanishLanguage=Menus et dialogues Espagnol
Modified: trunk/Translations/InnoSetup/Galician.isl
===================================================================
--- trunk/Translations/InnoSetup/Galician.isl 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Translations/InnoSetup/Galician.isl 2010-06-17 19:37:02 UTC (rev 7197)
@@ -358,6 +358,7 @@
PortugueseLanguage=Portuguese menus and dialogs
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
+SerbianLanguage=Serbian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
Modified: trunk/Translations/InnoSetup/German.isl
===================================================================
--- trunk/Translations/InnoSetup/German.isl 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Translations/InnoSetup/German.isl 2010-06-17 19:37:02 UTC (rev 7197)
@@ -348,6 +348,7 @@
PortugueseLanguage=Portugiesische Men\xFCs und Dialoge
RomanianLanguage=Rum\xE4nisch Men\xFCs und Dialoge
RussianLanguage=Russische Men\xFCs und Dialoge
+SerbianLanguage=Serbische Men\xFCs und Dialoge
SlovakLanguage=Slowakische Men\xFCs und Dialoge
SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanische Men\xFCs und Dialoge
Modified: trunk/Translations/InnoSetup/Greek.isl
===================================================================
--- trunk/Translations/InnoSetup/Greek.isl 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Translations/InnoSetup/Greek.isl 2010-06-17 19:37:02 UTC (rev 7197)
@@ -359,6 +359,7 @@
PortugueseLanguage=\xD0\xEF\xF1\xF4\xEF\xE3\xE1\xEB\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
RomanianLanguage=\xD1\xEF\xF5\xEC\xE1\xED\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
RussianLanguage=\xD1\xF9\xF3\xF3\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
+SerbianLanguage=Serbian menus and dialogs
SlovakLanguage=\xD3\xEB\xEF\xE2\xE1\xEA\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
SlovenianLanguage=\xD3\xEB\xEF\xE2\xE5\xED\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
SpanishLanguage=\xC9\xF3\xF0\xE1\xED\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
Modified: trunk/Translations/InnoSetup/Hungarian.isl
===================================================================
--- trunk/Translations/InnoSetup/Hungarian.isl 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Translations/InnoSetup/Hungarian.isl 2010-06-17 19:37:02 UTC (rev 7197)
@@ -378,6 +378,7 @@
PortugueseLanguage=Portug\xE1l men\xFCk \xE9s p\xE1rbesz\xE9dablakok
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Orosz men\xFCk \xE9s p\xE1rbesz\xE9dablakok
+SerbianLanguage=Serbian menus and dialogs
SlovakLanguage=Szlov\xE1k men\xFCk \xE9s p\xE1rbesz\xE9dablakok
SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanyol men\xFCk \xE9s p\xE1rbesz\xE9dablakok
Modified: trunk/Translations/InnoSetup/Italian.isl
===================================================================
--- trunk/Translations/InnoSetup/Italian.isl 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Translations/InnoSetup/Italian.isl 2010-06-17 19:37:02 UTC (rev 7197)
@@ -362,6 +362,7 @@
PortugueseLanguage=Menu e finestre di dialogo in portoghese
RomanianLanguage=Menu e finestre di dialogo in Romeno
RussianLanguage=Menu e finestre di dialogo in russo
+SerbianLanguage=Serbian menus and dialogs
SlovakLanguage=Menu e finestre di dialogo in slovacco
SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Menu e finestre di dialogo in spagnolo
Modified: trunk/Translations/InnoSetup/Japanese.isl
===================================================================
--- trunk/Translations/InnoSetup/Japanese.isl 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Translations/InnoSetup/Japanese.isl 2010-06-17 19:37:02 UTC (rev 7197)
@@ -351,6 +351,7 @@
PortugueseLanguage=Portuguese menus and dialogs
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
+SerbianLanguage=Serbian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
Modified: trunk/Translations/InnoSetup/Korean.isl
===================================================================
--- trunk/Translations/InnoSetup/Korean.isl 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Translations/InnoSetup/Korean.isl 2010-06-17 19:37:02 UTC (rev 7197)
@@ -363,6 +363,7 @@
PortugueseLanguage=Portuguese menus and dialogs
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
+SerbianLanguage=Serbian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
Modified: trunk/Translations/InnoSetup/Norwegian.isl
===================================================================
--- trunk/Translations/InnoSetup/Norwegian.isl 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Translations/InnoSetup/Norwegian.isl 2010-06-17 19:37:02 UTC (rev 7197)
@@ -355,6 +355,7 @@
PortugueseLanguage=Portugisiske menyer og dialoger
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russiske menyer og dialoger
+SerbianLanguage=Serbian menus and dialogs
SlovakLanguage=Slovakiske menyer og dialoger
SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanske menyer og dialoger
Modified: trunk/Translations/InnoSetup/Persian.isl
===================================================================
--- trunk/Translations/InnoSetup/Persian.isl 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Translations/InnoSetup/Persian.isl 2010-06-17 19:37:02 UTC (rev 7197)
@@ -359,6 +359,7 @@
PortugueseLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \x81\xD1\xCA\xDE\xC7\xE1\xED
RomanianLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \xD1\xE6\xE3\xC7\xE4\xED
RussianLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \xD1\xE6\xD3\xED
+SerbianLanguage=Serbian menus and dialogs
SlovakLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \xC7\xD3\xE1\xE6ǘ\xED
SlovenianLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \xC7\xD3\xE1\xC7\xE6\xED
SpanishLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \xC7Ӂ\xC7\xE4\xED\xC7\xED\xED
Modified: trunk/Translations/InnoSetup/Polish.isl
===================================================================
--- trunk/Translations/InnoSetup/Polish.isl 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Translations/InnoSetup/Polish.isl 2010-06-17 19:37:02 UTC (rev 7197)
@@ -348,6 +348,7 @@
PortugueseLanguage=Portugalski interfejs
RomanianLanguage=Rumu\xF1ski interfejs
RussianLanguage=Rosyjski interfejs
+SerbianLanguage=Serbian menus and dialogs
SlovakLanguage=S\xB3owacki interfejs
SlovenianLanguage=S\xB3owe\xF1ski interfejs
SpanishLanguage=Hiszpa\xF1ski interfejs
Modified: trunk/Translations/InnoSetup/Portuguese.isl
===================================================================
--- trunk/Translations/InnoSetup/Portuguese.isl 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Translations/InnoSetup/Portuguese.isl 2010-06-17 19:37:02 UTC (rev 7197)
@@ -340,6 +340,7 @@
PortugueseLanguage=Portuguese menus and dialogs
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
+SerbianLanguage=Serbian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
Modified: trunk/Translations/InnoSetup/Romanian.isl
===================================================================
--- trunk/Translations/InnoSetup/Romanian.isl 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Translations/InnoSetup/Romanian.isl 2010-06-17 19:37:02 UTC (rev 7197)
@@ -359,6 +359,7 @@
PortugueseLanguage=Meniuri si dialoguri \xEEn Portugheza
RomanianLanguage=Meniuri si dialoguri \xEEn Rom\xE2na
RussianLanguage=Meniuri si dialoguri \xEEn Rusa
+SerbianLanguage=Serbian menus and dialogs
SlovakLanguage=Meniuri si dialoguri \xEEn Slovaca
SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Meniuri si dialoguri \xEEn Spaniola
Modified: trunk/Translations/InnoSetup/Russian.isl
===================================================================
--- trunk/Translations/InnoSetup/Russian.isl 2010-06-17 16:40:17 UTC (rev 7196)
+++ trunk/Translations/InnoSetup/Russian.isl 2010-06-17 19:37:02 UTC (rev 7197)
@@ -346,6 +346,7 @@
PortugueseLanguage=Portuguese menus and dialogs
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
+SerbianLanguage=Serbian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
Added: trunk/Translations/InnoSetup/Serbian.isl
===================================================================
--- trunk/Translations/InnoSetup/Serbian.isl (rev 0)
+++ trunk/Translations/InnoSetup/Serbian.isl 2010-06-17 19:37:02 UTC (rev 7197)
@@ -0,0 +1,380 @@
+; *** Inno Setup version 5.1.11+ Serbian (Cyrillic) messages ***
+;
+; Vladimir Stefanovic, ant...@gm..., 18.10.2008
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+
+[LangOptions]
+LanguageName=<0421><0440><043F><0441><043A><0438>
+LanguageID=$0C1A
+LanguageCodePage=1251
+; If the language you are translating to requires special font faces or
+; sizes, uncomment any of the following entries and change them accordingly.
+;DialogFontName=
+;DialogFontSize=8
+;WelcomeFontName=Verdana
+;WelcomeFontSize=12
+;TitleFontName=Arial
+;TitleFontSize=29
+;CopyrightFontName=Arial
+;CopyrightFontSize=8
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=\xC8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0
+SetupWindowTitle=\xC8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0 - %1
+UninstallAppTitle=\xC4\xE5\xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0
+UninstallAppFullTitle=%1 \xC4\xE5\xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0
+
+; *** Misc. common
+InformationTitle=\xC8\xED\xF4\xEE\xF0\xEC\xE0\xF6\xE8\xBC\xE5
+ConfirmTitle=\xCF\xEE\xF2\xE2\xF0\xE4\xE0
+ErrorTitle=\xC3\xF0\xE5\xF8\xEA\xE0
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=\xCE\xE2\xE8\xEC \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xEE\xEC \x9E\xE5\xF2\xE5 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xF2\xE8 %1. \xC4\xE0 \xEB\xE8 \xE6\xE5\xEB\xE8\xF2\xE5 \xE4\xE0 \xED\xE0\xF1\xF2\xE0\xE2\xE8\xF2\xE5?
+LdrCannotCreateTemp=\xCD\xE8\xBC\xE5 \xEC\xEE\xE3\xF3\x9E\xE5 \xED\xE0\xEF\xF0\xE0\xE2\xE8\xF2\xE8 \xEF\xF0\xE8\xE2\xF0\xE5\xEC\xE5\xED\xF3 \xE4\xE0\xF2\xEE\xF2\xE5\xEA\xF3. \xC8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0 \xBC\xE5 \xEF\xF0\xE5\xEA\xE8\xED\xF3\xF2\xE0
+LdrCannotExecTemp=\xCD\xE8\xBC\xE5 \xEC\xEE\xE3\xF3\x9E\xE5 \xEF\xEE\xEA\xF0\xE5\xED\xF3\xF2\xE8 \xE4\xE0\xF2\xEE\xF2\xE5\xEA\xF3 \xF3 \xEF\xF0\xE8\xE2\xF0\xE5\xEC\xE5\xED\xEE\xEC \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xBC\xF3\xEC\xF3. \xC8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0 \xBC\xE5 \xEF\xF0\xE5\xEA\xE8\xED\xF3\xF2\xE0
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%n\xC3\xF0\xE5\xF8\xEA\xE0 %2: %3
+SetupFileMissing=\xC4\xE0\xF2\xEE\xF2\xE5\xEA\xE0 %1 \xED\xE5\xE4\xEE\xF1\xF2\xE0\xBC\xE5 \xF3 \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xEE\xED\xEE\xEC \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xBC\xF3\xEC\xF3. \xCC\xEE\xEB\xE8\xEC\xEE \xC2\xE0\xF1 \xE8\xF1\xEF\xF0\xE0\xE2\xE8\xF2\xE5 \xEF\xF0\xEE\xE1\xEB\xE5\xEC \xE8\xEB\xE8 \xED\xE0\xE1\xE0\xE2\xE8\xF2\xE5 \xED\xEE\xE2\xF3 \xEA\xEE\xEF\xE8\xBC\xF3 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE0.
+SetupFileCorrupt=\xC8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xEE\xED\xE5 \xE4\xE0\xF2\xEE\xF2\xE5\xEA\xE5 \xF1\xF3 \xED\xE5\xE8\xF1\xEF\xF0\xE0\xE2\xED\xE5. \xCC\xEE\xEB\xE8\xEC\xEE \xC2\xE0\xF1 \xE4\xE0 \xED\xE0\xE1\xE0\xE2\xE8\xF2\xE5 \xED\xEE\xE2\xF3 \xEA\xEE\xEF\xE8\xBC\xF3 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE0.
+SetupFileCorruptOrWrongVer=\xC8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xEE\xED\xE5 \xE4\xE0\xF2\xEE\xF2\xE5\xEA\xE5 \xF1\xF3 \xED\xE5\xE8\xF1\xEF\xF0\xE0\xE2\xED\xE5, \xE8\xEB\xE8 \xED\xE8\xF1\xF3 \xF3\xF1\xE0\xE3\xEB\xE0\xF8\xE5\xED\xE5 \xF1\xE0 \xEE\xE2\xEE\xEC \xE2\xE5\xF0\xE7\xE8\xBC\xEE\xEC \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE5. \xCC\xEE\xEB\xE8\xEC\xEE \xC2\xE0\xF1 \xE8\xF1\xEF\xF0\xE0\xE2\xE8\xF2\xE5 \xEF\xF0\xEE\xE1\xEB\xE5\xEC \xE8\xEB\xE8 \xED\xE0\xE1\xE0\xE2\xE8\xF2\xE5 \xED\xEE\xE2\xF3 \xEA\xEE\xEF\xE8\xBC\xF3 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE0.
+NotOnThisPlatform=\xCE\xE2\xE0\xBC \xEF\xF0\xEE\xE3\xF0\xE0\xEC \xF1\xE5 \xED\xE5\x9E\xE5 \xEF\xEE\xEA\xF0\xE5\xED\xF3\xF2\xE8 \xED\xE0 %1.
+OnlyOnThisPlatform=\xCE\xE2\xE0\xBC \xEF\xF0\xEE\xE3\xF0\xE0\xEC \xF1\xE5 \xEC\xEE\xF0\xE0 \xEF\xEE\xEA\xF0\xE5\xED\xF3\xF2\xE8 \xED\xE0 %1.
+OnlyOnTheseArchitectures=\xCE\xE2\xE0\xBC \xEF\xF0\xEE\xE3\xF0\xE0\xEC \xF1\xE5 \xEC\xEE\xE6\xE5 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xF2\xE8 \xF1\xE0\xEC\xEE \xED\xE0 \xE2\xE5\xF0\xE7\xE8\xBC\xE0\xEC\xE0 Windows-\xE0 \xEF\xF0\xEE\xBC\xE5\xEA\xF2\xEE\xE2\xE0\xED\xE8\xEC \xE7\xE0 \xF1\xEB\xE5\xE4\xE5\x9E\xE5 \xEF\xF0\xEE\xF6\xE5\xF1\xEE\xF0\xF1\xEA\xE5 \xE0\xF0\xF5\xE8\xF2\xE5\xEA\xF2\xF3\xF0\xE5:%n%n%1
+MissingWOW64APIs=\xC2\xE5\xF0\xE7\xE8\xBC\xE0 Windows-\xE0 \xEA\xEE\xBC\xF3 \xEA\xEE\xF0\xE8\xF1\xF2\xE8\xF2\xE5 \xED\xE5 \xF1\xE0\xE4\xF0\xE6\xE8 \xEC\xEE\xE3\xF3\x9E\xED\xEE\xF1\xF2\xE8 \xEF\xEE\xF2\xF0\xE5\xE1\xED\xE5 \xE7\xE0 \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xEE\xED\xF3 \xEF\xF0\xEE\xF6\xE5\xE4\xF3\xF0\xF3 \xE4\xE0 \xF3\xF0\xE0\xE4\xE8 64-\xE1\xE8\xF2\xED\xF3 \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xF3. \xC4\xE0 \xE1\xE8 \xF0\xE5\xF8\xE8\xEB\xE8 \xEE\xE2\xE0\xBC \xEF\xF0\xEE\xE1\xEB\xE5\xEC, \xEC\xEE\xEB\xE8\xEC\xEE \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xBC\xF2\xE5 Service P\xE0ck %1.
+WinVersionTooLowError=\xCE\xE2\xE0\xBC \xEF\xF0\xEE\xE3\xF0\xE0\xEC \xE7\xE0\xF5\xF2\xE5\xE2\xE0 %1 \xE2\xE5\xF0\xE7\xE8\xBC\xF3 %2 \xE8\xEB\xE8 \xED\xEE\xE2\xE8\xBC\xF3.
+WinVersionTooHighError=\xCE\xE2\xE0\xBC \xEF\xF0\xEE\xE3\xF0\xE0\xEC \xF1\xE5 \xED\xE5 \xEC\xEE\xE6\xE5 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xF2\xE8 \xED\xE0 %1 \xE2\xE5\xF0\xE7\xE8\xBC\xE8 %2 \xE8\xEB\xE8 \xED\xEE\xE2\xE8\xBC\xEE\xBC.
+AdminPrivilegesRequired=\xCC\xEE\xF0\xE0\xF2\xE5 \xE1\xE8\xF2\xE8 \xEF\xF0\xE8\xBC\xE0\xE2\x9A\xE5\xED\xE8 \xEA\xE0\xEE \xE0\xE4\xEC\xE8\xED\xE8\xF1\xF2\xF0\xE0\xF2\xEE\xF0 \xE4\xE0 \xE1\xE8 \xF1\xF2\xE5 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xEB\xE8 \xEE\xE2\xE0\xBC \xEF\xF0\xEE\xE3\xF0\xE0\xEC.
+PowerUserPrivilegesRequired=\xCC\xEE\xF0\xE0\xF2\xE5 \xE1\xE8\xF2\xE8 \xEF\xF0\xE8\xBC\xE0\xE2\x9A\xE5\xED\xE8 \xEA\xE0\xEE \xE0\xE4\xEC\xE8\xED\xE8\xF1\xF2\xF0\xE0\xF2\xEE\xF0 \xE8\xEB\xE8 \xEA\xE0\xEE \xF7\xEB\xE0\xED Power Users \xE3\xF0\xF3\xEF\xE5 \xEA\xE0\xE4\xE0 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xF2\xE5 \xEE\xE2\xE0\xBC \xEF\xF0\xEE\xE3\xF0\xE0\xEC.
+SetupAppRunningError=\xC8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0 \xBC\xE5 \xEE\xF2\xEA\xF0\xE8\xEB\xE0 \xE4\xE0 \xF1\xE5 %1 \xF2\xF0\xE5\xED\xF3\xF2\xED\xEE \xE8\xE7\xE2\xF0\xF8\xE0\xE2\xE0.%n%n\xCC\xEE\xEB\xE8\xEC\xEE \xE4\xE0 \xEE\xE4\xEC\xE0\xF5 \xE7\xE0\xF2\xE2\xEE\xF0\xE8\xF2\xE5 \xF1\xE2\xE5 \x9C\xE5\xE3\xEE\xE2\xE5 \xE8\xED\xF1\xF2\xE0\xED\xF6\xE5, \xE0 \xE7\xE0\xF2\xE8\xEC \xEF\xF0\xE8\xF2\xE8\xF1\xED\xE8\xF2\xE5 OK \xE7\xE0 \xED\xE0\xF1\xF2\xE0\xE2\xE0\xEA, \xE8\xEB\xE8 Cancel \xE4\xE0 \xEE\xE4\xF3\xF1\xF2\xE0\xED\xE5\xF2\xE5.
+UninstallAppRunningError=\xC4\xE5\xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0 \xBC\xE5 \xEE\xF2\xEA\xF0\xE8\xEB\xE0 \xE4\xE0 \xF1\xE5 %1 \xF2\xF0\xE5\xED\xF3\xF2\xED\xEE \xE8\xE7\xE2\xF0\xF8\xE0\xE2\xE0.%n%n\xCC\xEE\xEB\xE8\xEC\xEE \xE4\xE0 \xEE\xE4\xEC\xE0\xF5 \xE7\xE0\xF2\xE2\xEE\xF0\xE8\xF2\xE5 \xF1\xE2\xE5 \x9C\xE5\xE3\xEE\xE2\xE5 \xE8\xED\xF1\xF2\xE0\xED\xF6\xE5, \xE0 \xE7\xE0\xF2\xE8\xEC \xEF\xF0\xE8\xF2\xE8\xF1\xED\xE8\xF2\xE5 OK \xE7\xE0 \xED\xE0\xF1\xF2\xE0\xE2\xE0\xEA, \xE8\xEB\xE8 Cancel \xE4\xE0 \xEE\xE4\xF3\xF1\xF2\xE0\xED\xE5\xF2\xE5.
+
+; *** Misc. errors
+ErrorCreatingDir=\xC8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0 \xED\xE8\xBC\xE5 \xEC\xEE\xE3\xEB\xE0 \xE4\xE0 \xED\xE0\xEF\xF0\xE0\xE2\xE8 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xBC\xF3\xEC "%1"
+ErrorTooManyFilesInDir=\xCD\xE8\xBC\xE5 \xEC\xEE\xE3\xF3\x9E\xE5 \xED\xE0\xEF\xF0\xE0\xE2\xE8\xF2\xE8 \xE4\xE0\xF2\xEE\xF2\xE5\xEA\xF3 \xF3 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xBC\xF3\xEC\xF3 "%1" \xE7\xE0\xF2\xEE \xF8\xF2\xEE \xF1\xE0\xE4\xF0\xE6\xE8 \xEF\xF0\xE5\xE2\xE8\xF8\xE5 \xE4\xE0\xF2\xEE\xF2\xE5\xEA\xE0
+
+; *** Setup common messages
+ExitSetupTitle=\xCF\xF0\xE5\xEA\xE8\xE4\xE0\x9C\xE5 \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE5
+ExitSetupMessage=\xC8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0 \xED\xE8\xBC\xE5 \xE7\xE0\xE2\xF0\xF8\xE5\xED\xE0. \xC0\xEA\xEE \xF1\xE0\xE4\xE0 \xEF\xF0\xE5\xEA\xE8\xED\xE5\xF2\xE5 \xC8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xF3, \xEF\xF0\xEE\xE3\xF0\xE0\xEC \xED\xE5\x9E\xE5 \xE1\xE8\xF2\xE8 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xED.%n%n\xC8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xF3 \xEC\xEE\xE6\xE5\xF2\xE5 \xEF\xEE\xEA\xF0\xE5\xED\xF3\xF2\xE8 \xE8 \xE4\xEE\xE2\xF0\xF8\xE8\xF2\xE8 \xED\xE5\xEA\xEE\xEC \xE4\xF3\xE3\xEE\xEC \xEF\xF0\xE8\xEB\xE8\xEA\xEE\xEC.%n%n\xCF\xF0\xE5\xEA\xE8\xE4 \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE5?
+AboutSetupMenuItem=&\xCE \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE8...
+AboutSetupTitle=\xCE \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE8
+AboutSetupMessage=%1 \xE2\xE5\xF0\xE7\xE8\xBC\xE0 %2%n%3%n%n%1 \xEC\xE0\xF2\xE8\xF7\xED\xE0 \xF1\xF2\xF0\xE0\xED\xE8\xF6\xE0:%n%4
+AboutSetupNote=
+TranslatorNote=
+
+; *** Buttons
+ButtonBack=< &\xCD\xE0\xE7\xE0\xE4
+ButtonNext=&\xC4\xE0\x9A\xE5 >
+ButtonInstall=&\xC8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xBC
+ButtonOK=\xCE\xCA
+ButtonCancel=\xCE\xE4\xF3\xF1\xF2\xE0\xED\xE8
+ButtonYes=&\xC4\xE0
+ButtonYesToAll=\xC4\xE0 \xE7\xE0 &\xD1\xE2\xE5
+ButtonNo=&\xCD\xE5
+ButtonNoToAll=\xCD&\xE5 \xE7\xE0 \xD1\xE2\xE5
+ButtonFinish=&\xC7\xE0\xE2\xF0\xF8\xE5\xF2\xE0\xEA
+ButtonBrowse=&\xC8\xE7\xE0\xE1\xE5\xF0\xE8...
+ButtonWizardBrowse=\xC8&\xE7\xE0\xE1\xE5\xF0\xE8...
+ButtonNewFolder=&\xCD\xE0\xEF\xF0\xE0\xE2\xE8 \xED\xEE\xE2\xE8 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xBC\xF3\xEC
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=\xC8\xE7\xE0\xE1\xE5\xF0\xE8\xF2\xE5 \xBC\xE5\xE7\xE8\xEA \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE5
+SelectLanguageLabel=\xC8\xE7\xE0\xE1\xE5\xF0\xE8\xF2\xE5 \xBC\xE5\xE7\xE8\xEA \xEA\xEE\xBC\xE8 \xE6\xE5\xEB\xE8\xF2\xE5 \xE4\xE0 \xEA\xEE\xF0\xE8\xF1\xF2\xE8\xF2\xE5 \xEF\xF0\xE8\xEB\xE8\xEA\xEE\xEC \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE5:
+
+; *** Common wizard text
+ClickNext=\xCF\xF0\xE8\xF2\xE8\xF1\xED\xE8\xF2\xE5 \xC4\xE0\x9A\xE5 \xE4\xE0 \xED\xE0\xF1\xF2\xE0\xE2\xE8\xF2\xE5, \xE8\xEB\xE8 \xCE\xE4\xF3\xF1\xF2\xE0\xED\xE8 \xE4\xE0 \xED\xE0\xEF\xF3\xF1\xF2\xE8\xF2\xE5 \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xF3.
+BeveledLabel=
+BrowseDialogTitle=\xC8\xE7\xE0\xE1\xE5\xF0\xE8\xF2\xE5 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xBC\xF3\xEC
+BrowseDialogLabel=\xC8\xE7\xE0\xE1\xE5\xF0\xE8\xF2\xE5 \xBC\xE5\xE4\xE0\xED \xEE\xE4 \xEF\xEE\xED\xF3\x90\xE5\xED\xE8\xF5 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xBC\xF3\xEC\xE0 \xE8\xE7 \xEB\xE8\xF1\xF2\xE5, \xE0 \xE7\xE0\xF2\xE8\xEC \xEF\xF0\xE8\xF2\xE8\xF1\xED\xE8\xF2\xE5 \xCE\xCA.
+NewFolderName=\xCD\xEE\xE2\xE8 \xC4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xBC\xF3\xEC
+
+; *** "Welcome" wizard page
+WelcomeLabel1=\xC4\xEE\xE1\xF0\xEE\xE4\xEE\xF8\xEB\xE8 \xF3 [name] \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xEE\xED\xF3 \xEF\xF0\xEE\xF6\xE5\xE4\xF3\xF0\xF3
+WelcomeLabel2=\xD1\xE0\xE4\xE0 \x9E\xE5 \xF1\xE5 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xF2\xE8 [name/ver] \xED\xE0 \xC2\xE0\xF8 \xF0\xE0\xF7\xF3\xED\xE0\xF0.%n%n\xCF\xF0\xE5\xEF\xEE\xF0\xF3\xF7\xF3\xBC\xE5 \xF1\xE5 \xE4\xE0 \xE7\xE0\xF2\xE2\xEE\xF0\xE8\xF2\xE5 \xF1\xE2\xE5 \xE4\xF0\xF3\xE3\xE5 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE5 \xEF\xF0\xE5 \xED\xE0\xF1\xF2\xE0\xE2\xEA\xE0.
+
+; *** "Password" wizard page
+WizardPassword=\xD8\xE8\xF4\xF0\xE0
+PasswordLabel1=\xCE\xE2\xE0 \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0 \xBC\xE5 \xE7\xE0\xF8\xF2\xE8\x9E\xE5\xED\xE0 \xF8\xE8\xF4\xF0\xEE\xEC.
+PasswordLabel3=\xCC\xEE\xEB\xE8\xEC\xEE \xF3\xEF\xE8\xF8\xE8\xF2\xE5 \xF8\xE8\xF4\xF0\xF3, \xE0 \xE7\xE0\xF2\xE8\xEC \xEF\xF0\xE8\xF2\xE8\xF1\xED\xE8\xF2\xE5 \xC4\xE0\x9A\xE5 \xE7\xE0 \xED\xE0\xF1\xF2\xE0\xE2\xE0\xEA. \xC2\xEE\xE4\xE8\xF2\xE5 \xF0\xE0\xF7\xF3\xED\xE0 \xE4\xE0 \xF1\xF3 \xE2\xE5\xEB\xE8\xEA\xE0 \xE8 \xEC\xE0\xEB\xE0 \xF1\xEB\xEE\xE2\xE0 \xF3 \xF8\xE8\xF4\xF0\xE8 \xE1\xE8\xF2\xED\xE0.
+PasswordEditLabel=&\xD8\xE8\xF4\xF0\xE0:
+IncorrectPassword=\xD8\xE8\xF4\xF0\xE0 \xEA\xEE\xBC\xF3 \xF1\xF2\xE5 \xF3\xEF\xE8\xF1\xE0\xEB\xE8 \xED\xE8\xBC\xE5 \xE8\xF1\xEF\xF0\xE0\xE2\xED\xE0. \xCC\xEE\xEB\xE8\xEC\xEE \xEF\xEE\xEA\xF3\xF8\xE0\xBC\xF2\xE5 \xEF\xEE\xED\xEE\xE2\xEE.
+
+; *** "License Agreement" wizard
+WizardLicense=\xD3\xE3\xEE\xE2\xEE\xF0 \xEE \xEA\xEE\xF0\xE8\xF8\x9E\xE5\x9C\xF3
+LicenseLabel=\xCC\xEE\xEB\xE8\xEC\xEE \xEF\xF0\xEE\xF7\xE8\xF2\xE0\xBC\xF2\xE5 \xEF\xE0\xE6\x9A\xE8\xE2\xEE \xF1\xEB\xE5\xE4\xE5\x9E\xE5 \xE2\xE0\xE6\xED\xE5 \xE8\xED\xF4\xEE\xF0\xEC\xE0\xF6\xE8\xBC\xE5 \xEF\xF0\xE5 \xED\xE0\xF1\xF2\xE0\xE2\xEA\xE0.
+LicenseLabel3=\xCC\xEE\xEB\xE8\xEC\xEE \xEF\xF0\xEE\xF7\xE8\xF2\xE0\xBC\xF2\xE5 \xD3\xE3\xEE\xE2\xEE\xF0 \xEE \xEA\xEE\xF0\xE8\xF8\x9E\xE5\x9C\xF3, \xEA\xEE\xBC\xE8 \xF1\xEB\xE5\xE4\xE8. \xCC\xEE\xF0\xE0\xF2\xE5 \xEF\xF0\xE8\xF5\xE2\xE0\xF2\xE8\xF2\xE8 \xF3\xF1\xEB\xEE\xE2\xE5 \xEE\xE2\xEE\xE3 \xF3\xE3\xEE\xE2\xEE\xF0\xE0 \xEF\xF0\xE5 \xED\xE0\xF1\xF2\xE0\xE2\xEA\xE0 \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE5.
+LicenseAccepted=&\xCF\xF0\xE8\xF5\xE2\xE0\xF2\xE0\xEC \xF3\xE3\xEE\xE2\xEE\xF0
+LicenseNotAccepted=&\xCD\xE5 \xEF\xF0\xE8\xF5\xE2\xE0\xF2\xE0\xEC \xF3\xE3\xEE\xE2\xEE\xF0
+
+; *** "Information" wizard pages
+WizardInfoBefore=\xC8\xED\xF4\xEE\xF0\xEC\xE0\xF6\xE8\xBC\xE5
+InfoBeforeLabel=\xCC\xEE\xEB\xE8\xEC\xEE \xEF\xF0\xEE\xF7\xE8\xF2\xE0\xBC\xF2\xE5 \xEF\xE0\xE6\x9A\xE8\xE2\xEE \xF1\xEB\xE5\xE4\xE5\x9E\xE5 \xE2\xE0\xE6\xED\xE5 \xE8\xED\xF4\xEE\xF0\xEC\xE0\xF6\xE8\xBC\xE5 \xEF\xF0\xE5 \xED\xE0\xF1\xF2\xE0\xE2\xEA\xE0.
+InfoBeforeClickLabel=\xCA\xE0\xE4\xE0 \xE1\xF3\xE4\xE5\xF2\xE5 \xF1\xEF\xF0\xE5\xEC\xED\xE8 \xE4\xE0 \xED\xE0\xF1\xF2\xE0\xE2\xE8\xF2\xE5 \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xF3, \xEF\xF0\xE8\xF2\xE8\xF1\xED\xE8\xF2\xE5 \xC4\xE0\x9A\xE5.
+WizardInfoAfter=\xC8\xED\xF4\xEE\xF0\xEC\xE0\xF6\xE8\xBC\xE5
+InfoAfterLabel=\xCC\xEE\xEB\xE8\xEC\xEE \xC2\xE0\xF1 \xEF\xF0\xEE\xF7\xE8\xF2\xE0\xBC\xF2\xE5 \xEF\xE0\xE6\x9A\xE8\xE2\xEE \xF1\xEB\xE5\xE4\xE5\x9E\xE5 \xE2\xE0\xE6\xED\xE5 \xE8\xED\xF4\xEE\xF0\xEC\xE0\xF6\xE8\xBC\xE5 \xEF\xF0\xE5 \xED\xE0\xF1\xF2\xE0\xE2\xEA\xE0.
+InfoAfterClickLabel=\xCA\xE0\xE4\xE0 \xE1\xF3\xE4\xE5\xF2\xE5 \xF1\xEF\xF0\xE5\xEC\xED\xE8 \xE4\xE0 \xED\xE0\xF1\xF2\xE0\xE2\xE8\xF2\xE5 \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xF3, \xEF\xF0\xE8\xF2\xE8\xF1\xED\xE8\xF2\xE5 \xC4\xE0\x9A\xE5.
+
+; *** "User Information" wizard page
+WizardUserInfo=\xCF\xEE\xE4\xE0\xF6\xE8 \xEE \xEA\xEE\xF0\xE8\xF1\xED\xE8\xEA\xF3
+UserInfoDesc=\xCC\xEE\xEB\xE8\xEC\xEE \xF3\xED\xE5\xF1\xE8\xF2\xE5 \xC2\xE0\xF8\xE5 \xEF\xEE\xE4\xE0\xF2\xEA\xE5.
+UserInfoName=&\xCA\xEE\xF0\xE8\xF1\xED\xE8\xEA:
+UserInfoOrg=&\xCE\xF0\xE3\xE0\xED\xE8\xE7\xE0\xF6\xE8\xBC\xE0:
+UserInfoSerial=&\xD1\xE5\xF0\xE8\xBC\xF1\xEA\xE8 \xE1\xF0\xEE\xBC:
+UserInfoNameRequired=\xCC\xEE\xF0\xE0\xF2\xE5 \xF3\xEF\xE8\xF1\xE0\xF2\xE8 \xE8\xEC\xE5.
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=\xC8\xE7\xE0\xE1\xE5\xF0\xE8\xF2\xE5 \xEE\xE4\xF0\xE5\xE4\xE8\xF8\xED\xF3 \xEB\xEE\xEA\xE0\xF6\xE8\xBC\xF3
+SelectDirDesc=\xC3\xE4\xE5 [name] \xF2\xF0\xE5\xE1\xE0 \xE4\xE0 \xF1\xE5 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0?
+SelectDirLabel3=\xC8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0 \x9E\xE5 \xEF\xEE\xF1\xF2\xE0\xE2\xE8\xF2\xE8 [name] \xF3 \xF1\xEB\xE5\xE4\xE5\x9E\xE8 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xBC\xF3\xEC.
+SelectDirBrowseLabel=\xC4\xE0 \xED\xE0\xF1\xF2\xE0\xE2\xE8\xF2\xE5, \xEF\xF0\xE8\xF2\xE8\xF1\xED\xE8\xF2\xE5 \xC4\xE0\x9A\xE5. \xC0\xEA\xEE \xE6\xE5\xEB\xE8\xF2\xE5 \xE4\xE0 \xE8\xE7\xE0\xE1\xE5\xF0\xE5\xF2\xE5 \xED\xE5\xEA\xE8 \xE4\xF0\xF3\xE3\xE8 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xBC\xF3\xEC, \xEF\xF0\xE8\xF2\xE8\xF1\xED\xE8\xF2\xE5 \xC8\xE7\xE0\xE1\xE5\xF0\xE8.
+DiskSpaceMBLabel=\xCF\xEE\xF2\xF0\xE5\xE1\xED\xEE \xBC\xE5 \xED\xE0\xBC\xEC\xE0\x9C\xE5 [mb] MB \xF1\xEB\xEE\xE1\xEE\xE4\xED\xEE\xE3 \xEF\xF0\xEE\xF1\xF2\xEE\xF0\xE0 \xED\xE0 \xE4\xE8\xF1\xEA\xF3.
+ToUNCPathname=\xCF\xF3\xF2\xE0\x9C\xE0 \xE7\xE0 \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xF3 \xED\xE5 \xF1\xEC\xE5 \xE1\xE8\xF2\xE8 \xF3 UNC \xEE\xE1\xEB\xE8\xEA\xF3. \xC0\xEA\xEE \xEF\xEE\xEA\xF3\xF8\xE0\xE2\xE0\xF2\xE5 \xE4\xE0 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xF2\xE5 \xEF\xF0\xEE\xE3\xF0\xE0\xEC \xED\xE0 \xEC\xF0\xE5\xE6\xF3, \xEC\xEE\xF0\xE0\x9E\xE5\xF2\xE5 \xEF\xF0\xE5\xF2\xF5\xEE\xE4\xED\xEE \xE4\xE0 \xEC\xE0\xEF\xE8\xF0\xE0\xF2\xE5 \xEC\xF0\xE5\xE6\xED\xE8 \xE4\xE8\xF1\xEA.
+InvalidPath=\xCC\xEE\xF0\xE0\xF2\xE5 \xF3\xEF\xE8\xF1\xE0\xF2\xE8 \xEF\xF3\xED\xF3 \xEF\xF3\xF2\xE0\x9C\xF3 \xF1\xE0 \xEE\xE1\xE5\xEB\xE5\xE6\xBC\xE5\xEC \xE4\xE8\xF1\xEA\xE0; \xED\xE0 \xEF\xF0\xE8\xEC\xE5\xF0:%n%nC:\APP%n%n\xE8\xEB\xE8 UNC \xEF\xF3\xF2\xE0\x9C\xE0 \xF3 \xEE\xE1\xEB\xE8\xEA\xF3:%n%n\\server\sh\xE0re
+InvalidDrive=\xC4\xE8\xF1\xEA \xE8\xEB\xE8 UNC \xEF\xF3\xF2\xE0\x9C\xE0 \xEA\xEE\xBC\xF3 \xF1\xF2\xE5 \xE8\xE7\xE0\xE1\xF0\xE0\xEB\xE8 \xED\xE5 \xEF\xEE\xF1\xF2\xEE\xBC\xE5 \xE8\xEB\xE8 \xED\xE8\xF1\xF3 \xE4\xEE\xF1\xF2\xF3\xEF\xED\xE8. \xCC\xEE\xEB\xE8\xEC\xEE \xE8\xE7\xE0\xE1\xE5\xF0\xE8\xF2\xE5 \xED\xE5\xF8\xF2\xEE \xE4\xF0\xF3\xE3\xEE.
+DiskSpaceWarningTitle=\xCD\xE5\xEC\xE0 \xE4\xEE\xE2\xEE\x9A\xED\xEE \xEF\xF0\xEE\xF1\xF2\xEE\xF0\xE0 \xED\xE0 \xE4\xE8\xF1\xEA\xF3
+DiskSpaceWarning=\xC8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0 \xE7\xE0\xF5\xF2\xE5\xE2\xE0 \xED\xE0\xBC\xEC\xE0\x9C\xE5 %1 KB \xF1\xEB\xEE\xE1\xEE\xE4\xED\xEE\xE3 \xEF\xF0\xEE\xF1\xF2\xEE\xF0\xE0, \xE0 \xE8\xE7\xE0\xE1\xF0\xE0\xED\xE8 \xE4\xE8\xF1\xEA \xE8\xEC\xE0 \xF1\xE0\xEC\xEE %2 KB \xED\xE0 \xF0\xE0\xF1\xEF\xEE\xEB\xE0\xE3\xE0\x9C\xF3.%n%n\xC4\xE0 \xEB\xE8 \xE8\xEF\xE0\xEA \xE6\xE5\xEB\xE8\xF2\xE5 \xE4\xE0 \xED\xE0\xF1\xF2\xE0\xE2\xE8\xF2\xE5?
+DirNameTooLong=\xCD\xE0\xE7\xE8\xE2 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xBC\xF3\xEC\xE0 \xE8\xEB\xE8 \xEF\xF3\xF2\xE0\x9C\xE0 \xF1\xF3 \xEF\xF0\xE5\xE4\xF3\xE3\xE0\xF7\xEA\xE8.
+InvalidDirName=\xCD\xE0\xE7\xE8\xE2 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xBC\xF3\xEC\xE0 \xED\xE8\xBC\xE5 \xE8\xF1\xEF\xF0\xE0\xE2\xE0\xED.
+BadDirName32=\xCD\xE0\xE7\xE8\xE2\xE8 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xBC\xF3\xEC\xE0 \xED\xE5 \xF1\xEC\xE5\xBC\xF3 \xE8\xEC\xE0\xF2\xE8 \xE1\xE8\xEB\xEE \xEA\xEE\xBC\xE5 \xEE\xE4 \xF1\xEB\xE5\xE4\xE5\x9E\xE8\xF5 \xF1\xEB\xEE\xE2\xE0:%n%n%1
+DirExistsTitle=\xC4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xBC\xF3\xEC \xEF\xEE\xF1\xF2\xEE\xBC\xE8
+DirExists=\xC4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xBC\xF3\xEC:%n%n%1%n%n\xE2\xE5\x9E \xEF\xEE\xF1\xF2\xEE\xBC\xE8. \xC4\xE0 \xEB\xE8 \xE8\xEF\xE0\xEA \xE6\xE5\xEB\xE8\xF2\xE5 \xE4\xE0 \xEF\xF0\xEE\xE3\xF0\xE0\xEC \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xF2\xE5 \xF3 \x9C\xE5\xEC\xF3?
+DirDoesntExistTitle=\xC4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xBC\xF3\xEC \xED\xE5 \xEF\xEE\xF1\xF2\xEE\xBC\xE8
+DirDoesntExist=\xC4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xBC\xF3\xEC:%n%n%1%n%n\xED\xE5 \xEF\xEE\xF1\xF2\xEE\xBC\xE8. \xC4\xE0 \xEB\xE8 \xE6\xE5\xEB\xE8\xF2\xE5 \xE4\xE0 \xE3\xE0 \xED\xE0\xEF\xF0\xE0\xE2\xE8\xEC?
+
+; *** "Select Components" wizard page
+WizardSelectComponents=\xC8\xE7\xE0\xE1\xE5\xF0\xE8\xF2\xE5 \xEA\xEE\xEC\xEF\xEE\xED\xE5\xED\xF2\xE5
+SelectComponentsDesc=\xCA\xEE\xBC\xE5 \xEA\xEE\xEC\xEF\xEE\xED\xE5\xED\xF2\xE5 \x9E\xE5\xF2\xE5 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xF2\xE8?
+SelectComponentsLabel2=\xC8\xE7\xE0\xE1\xE5\xF0\xE8\xF2\xE5 \xEA\xEE\xEC\xEF\xEE\xED\xE5\xED\xF2\xE5 \xEA\xEE\xBC\xE5 \xE6\xE5\xEB\xE8\xF2\xE5 \xE4\xE0 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xF2\xE5; \xEE\xE1\xF0\xE8\xF8\xE8\xF2\xE5 \xEA\xEE\xEC\xEF\xEE\xED\xE5\xED\xF2\xE5 \xEA\xEE\xBC\xE5 \xED\xE5 \xE6\xE5\xEB\xE8\xF2\xE5 \xE4\xE0 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xF2\xE5. \xCF\xF0\xE8\xF2\xE8\xF1\xED\xE8\xF2\xE5 \xC4\xE0\x9A\xE5 \xEA\xE0\xE4\xE0 \xE1\xF3\xE4\xE5\xF2\xE5 \xF1\xEF\xF0\xE5\xEC\xED\xE8 \xE4\xE0 \xED\xE0\xF1\xF2\xE0\xE2\xE8\xF2\xE5.
+FullInstallation=\xCF\xF3\xED\xE0 \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=\xCA\xEE\xEC\xEF\xE0\xEA\xF2\xED\xE0 \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0
+CustomInstallation=\xC8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0 \xF1\xE0\xEC\xEE \xE6\xE5\x9A\xE5\xED\xE8\xF5 \xEA\xEE\xEC\xEF\xEE\xED\xE5\xED\xF2\xE8
+NoUninstallWarningTitle=\xCA\xEE\xEC\xEF\xEE\xED\xE5\xED\xF2\xE5 \xEF\xEE\xF1\xF2\xEE\xBC\xE5
+NoUninstallWarning=\xC8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0 \xBC\xE5 \xEE\xF2\xEA\xF0\xE8\xEB\xE0 \xE4\xE0 \xF1\xEB\xE5\xE4\xE5\x9E\xE5 \xEA\xEE\xEC\xEF\xEE\xED\xE5\xED\xF2\xE5 \xE2\xE5\x9E \xEF\xEE\xF1\xF2\xEE\xBC\xE5 \xED\xE0 \xC2\xE0\xF8\xE5\xEC \xF0\xE0\xF7\xF3\xED\xE0\xF0\xF3:%n%n%1%n%n\xCD\xE5\xEE\xE4\xE0\xE1\xE8\xF0\xE0\x9C\xE5 \xEE\xE2\xE8\xF5 \xEA\xEE\xEC\xEF\xEE\xED\xE5\xED\xF2\xE8 \xE8\xF5 \xED\xE5\x9E\xE5 \xF3\xEA\xEB\xEE\xED\xE8\xF2\xE8.%n%n\xC4\xE0 \xEB\xE8 \xE8\xEF\xE0\xEA \xE6\xE5\xEB\xE8\xF2\xE5 \xE4\xE0 \xED\xE0\xF1\xF2\xE0\xE2\xE8\xF2\xE5?
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceMBLabel=\xD2\xF0\xE5\xED\xF3\xF2\xED\xEE \xEE\xE4\xE0\xE1\xF0\xE0\xED\xE5 \xF1\xF2\xE0\xE2\xEA\xE5 \xE7\xE0\xF5\xF2\xE5\xE2\xE0\xBC\xF3 \xED\xE0\xBC\xEC\xE0\x9C\xE5 [mb] MB \xEF\xF0\xEE\xF1\xF2\xEE\xF0\xE0 \xED\xE0 \xE4\xE8\xF1\xEA\xF3.
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=\xC8\xE7\xE0\xE1\xE5\xF0\xE8\xF2\xE5 \xE4\xEE\xE4\xE0\xF2\xED\xE5 \xE7\xE0\xE4\xE0\xF2\xEA\xE5
+SelectTasksDesc=\xCA\xE0\xEA\xE2\xE5 \xE4\xEE\xE4\xE0\xF2\xED\xE5 \xE7\xE0\xE4\xE0\xF2\xEA\xE5 \xBC\xE5 \xBC\xEE\xF8 \xEF\xEE\xF2\xF0\xE5\xE1\xED\xEE \xEE\xE1\xE0\xE2\xE8\xF2\xE8?
+SelectTasksLabel2=\xC8\xE7\xE0\xE1\xE5\xF0\xE8\xF2\xE5 \xE4\xEE\xE4\xE0\xF2\xED\xE5 \xE7\xE0\xE4\xE0\xF2\xEA\xE5 \xEA\xEE\xBC\xE5 \xE6\xE5\xEB\xE8\xF2\xE5 \xE4\xE0 \xC8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0 [name] \xEE\xE1\xE0\xE2\xE8, \xE0 \xE7\xE0\xF2\xE8\xEC \xEF\xF0\xE8\xF2\xE8\xF1\xED\xE8\xF2\xE5 \xC4\xE0\x9A\xE5.
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=\xC8\xE7\xE0\xE1\xE5\xF0\xE8\xF2\xE5 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xBC\xF3\xEC \xE7\xE0 \xD1\xF2\xE0\xF0\xF2 \xEC\xE5\xED\xE8
+SelectStartMenuFolderDesc=\xC3\xE4\xE5 \xE6\xE5\xEB\xE8\xF2\xE5 \xE4\xE0 \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0 \xEF\xEE\xF1\xF2\xE0\xE2\xE8 \xEF\xF0\xE5\xF7\xE8\xF6\xE5 \xE7\xE0 \xEF\xF0\xEE\xE3\xF0\xE0\xEC?
+SelectStartMenuFolderLabel3=\xC8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0 \x9E\xE5 \xEF\xEE\xF1\xF2\xE0\xE2\xE8\xF2\xE8 \xEF\xF0\xE5\xF7\xE8\xF6\xE5 \xE7\xE0 \xEF\xF0\xEE\xE3\xF0\xE0\xEC \xF3 \xF1\xEB\xE5\xE4\xE5\x9E\xE5\xEC \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xBC\xF3\xEC\xF3 \xD1\xF2\xE0\xF0\xF2 \xEC\xE5\xED\xE8\xBC\xE0.
+SelectStartMenuFolderBrowseLabel=\xC4\xE0 \xED\xE0\xF1\xF2\xE0\xE2\xE8\xF2\xE5, \xEF\xF0\xE8\xF2\xE8\xF1\xED\xE8\xF2\xE5 \xC4\xE0\x9A\xE5. \xC0\xEA\xEE \xE6\xE5\xEB\xE8\xF2\xE5 \xE4\xE0 \xE8\xE7\xE0\xE1\xE5\xF0\xE5\xF2\xE5 \xED\xE5\xEA\xE8 \xE4\xF0\xF3\xE3\xE8 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xBC\xF3\xEC, \xEF\xF0\xE8\xF2\xE8\xF1\xED\xE8\xF2\xE5 \xC8\xE7\xE0\xE1\xE5\xF0\xE8.
+MustEnterGroupName=\xCC\xEE\xF0\xE0\xF2\xE5 \xF3\xEF\xE8\xF1\xE0\xF2\xE8 \xED\xE0\xE7\xE8\xE2 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xBC\xF3\xEC\xE0.
+GroupNameTooLong=\xCD\xE0\xE7\xE8\xE2 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xBC\xF3\xEC\xE0 \xE8\xEB\xE8 \xEF\xF3\xF2\xE0\x9C\xE0 \xF1\xF3 \xEF\xF0\xE5\xE4\xF3\xE3\xE0\xF7\xEA\xE8.
+InvalidGroupName=\xCD\xE0\xE7\xE8\xE2 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xBC\xF3\xEC\xE0 \xED\xE8\xBC\xE5 \xE8\xF1\xEF\xF0\xE0\xE2\xE0\xED.
+BadGroupName=\xCD\xE0\xE7\xE8\xE2 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xBC\xF3\xEC\xE0 \xED\xE5 \xF1\xEC\xE5 \xE8\xEC\xE0\xF2\xE8 \xE1\xE8\xEB\xEE \xEA\xEE\xBC\xE5 \xEE\xE4 \xF1\xEB\xE5\xE4\xE5\x9E\xE8\xF5 \xF1\xEB\xEE\xE2\xE0:%n%n%1
+NoProgramGroupCheck2=&\xCD\xE5\xEC\xEE\xBC \xE4\xE0 \xEF\xF0\xE0\xE2\xE8\xF8 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xBC\xF3\xEC \xF3 \xD1\xF2\xE0\xF0\xF2 \xEC\xE5\xED\xE8\xBC\xF3
+
+; *** "Ready to Install" wizard page
+WizardReady=\xC8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0 \xBC\xE5 \xF1\xEF\xF0\xE5\xEC\xED\xE0
+ReadyLabel1=\xC8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0 \xBC\xE5 \xF1\xEF\xF0\xE5\xEC\xED\xE0 \xE4\xE0 \xEF\xEE\xF1\xF2\xE0\xE2\xE8 [name] \xED\xE0 \xC2\xE0\xF8 \xF0\xE0\xF7\xF3\xED\xE0\xF0.
+ReadyLabel2a=\xCF\xF0\xE8\xF2\xE8\xF1\xED\xE8\xF2\xE5 \xC8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xBC \xE4\xE0 \xED\xE0\xF1\xF2\xE0\xE2\xE8\xF2\xE5 \xF1\xE0 \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xEE\xEC, \xE8\xEB\xE8 \xEF\xF0\xE8\xF2\xE8\xF1\xED\xE8\xF2\xE5 \xCD\xE0\xE7\xE0\xE4 \xE0\xEA\xEE \xE6\xE5\xEB\xE8\xF2\xE5 \xE4\xE0 \xEF\xEE\xED\xEE\xE2\xEE \xEF\xF0\xE5\xE3\xEB\xE5\xE4\xE0\xF2\xE5 \xE8\xEB\xE8 \xEF\xF0\xEE\xEC\xE5\xED\xE8\xF2\xE5 \xED\xE5\xEA\xE0 \xEF\xEE\xE4\xE5\xF8\xE0\xE2\xE0\x9C\xE0.
+ReadyLabel2b=\xCF\xF0\xE8\xF2\xE8\xF1\xED\xE8\xF2\xE5 \xC8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xBC \xE4\xE0 \xED\xE0\xF1\xF2\xE0\xE2\xE8\xF2\xE5 \xF1\xE0 \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xEE\xEC.
+ReadyMemoUserInfo=\xCF\xEE\xE4\xE0\xF6\xE8 \xEE \xEA\xEE\xF0\xE8\xF1\xED\xE8\xEA\xF3:
+ReadyMemoDir=\xCE\xE4\xF0\xE5\xE4\xE8\xF8\xED\xE0 \xEB\xEE\xEA\xE0\xF6\xE8\xBC\xE0:
+ReadyMemoType=\xD2\xE8\xEF \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE5:
+ReadyMemoComponents=\xC8\xE7\xE0\xE1\xF0\xE0\xED\xE5 \xEA\xEE\xEC\xEF\xEE\xED\xE5\xED\xF2\xE5:
+ReadyMemoGroup=\xC4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xBC\xF3\xEC \xD1\xF2\xE0\xF0\xF2 \xEC\xE5\xED\xE8\xBC\xE0:
+ReadyMemoTasks=\xC4\xEE\xE4\xE0\xF2\xED\xE8 \xEF\xEE\xF1\xEB\xEE\xE2\xE8:
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=\xCF\xF0\xE8\xEF\xF0\xE5\xEC\xE0 \xE7\xE0 \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xF3
+PreparingDesc=\xC8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0 \xF1\xE5 \xEF\xF0\xE8\xEF\xF0\xE5\xEC\xE0 \xE4\xE0 \xEF\xEE\xF1\xF2\xE0\xE2\xE8 [name] \xED\xE0 \xC2\xE0\xF8 \xF0\xE0\xF7\xF3\xED\xE0\xF0.
+PreviousInstallNotCompleted=\xC8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0/\xF3\xEA\xEB\xE0\x9C\xE0\x9C\xE5 \xEF\xF0\xE5\xF2\xF5\xEE\xE4\xED\xEE\xE3 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE0 \xED\xE8\xBC\xE5 \xE7\xE0\xE2\xF0\xF8\xE5\xED\xE0. \xCF\xEE\xF2\xF0\xE5\xE1\xED\xEE \xBC\xE5 \xE4\xE0 \xF0\xE5\xF1\xF2\xE0\xF0\xF2\xF3\xBC\xE5\xF2\xE5 \xC2\xE0\xF8 \xF0\xE0\xF7\xF3\xED\xE0\xF0 \xE4\xE0 \xE1\xE8 \xF1\xE5 \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0 \xE7\xE0\xE2\xF0\xF8\xE8\xEB\xE0.%n%n\xCD\xE0\xEA\xEE\xED \xF0\xE5\xF1\xF2\xE0\xF0\xF2\xEE\xE2\xE0\x9C\xE0 \xF0\xE0\xF7\xF3\xED\xE0\xF0\xE0, \xEF\xEE\xEA\xF0\xE5\xED\xE8\xF2\xE5 \xEF\xEE\xED\xEE\xE2\xEE \xC8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xF3 [name] \xE4\xE0 \xE1\xE8 \xF1\xF2\xE5 \xBC\xE5 \xE4\xEE\xE2\xF0\xF8\xE8\xEB\xE8.
+CannotContinue=\xC8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0 \xF1\xE5 \xED\xE5 \xEC\xEE\xE6\xE5 \xED\xE0\xF1\xF2\xE0\xE2\xE8\xF2\xE8. \xCC\xEE\xEB\xE8\xEC\xEE \xEF\xF0\xE8\xF2\xE8\xF1\xED\xE8\xF2\xE5 \xCE\xE4\xF3\xF1\xF2\xE0\xED\xE8 \xE4\xE0 \xE8\xE7\xE0\x90\xE5\xF2\xE5.
+
+; *** "Installing" wizard page
+WizardInstalling=\xC8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\x9C\xE5
+InstallingLabel=\xCC\xEE\xEB\xE8\xEC\xEE \xF1\xE0\xF7\xE5\xEA\xE0\xBC\xF2\xE5 \xE4\xEE\xEA \xF1\xE5 [name] \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0 \xED\xE0 \xC2\xE0\xF8 \xF0\xE0\xF7\xF3\xED\xE0\xF0.
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=[name] - \xE7\xE0\xE2\xF0\xF8\xE5\xF2\xE0\xEA \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE5
+FinishedLabelNoIcons=\xC8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE0 [name] \xED\xE0 \xC2\xE0\xF8 \xF0\xE0\xF7\xF3\xED\xE0\xF0 \xBC\xE5 \xE7\xE0\xE2\xF0\xF8\xE5\xED\xE0.
+FinishedLabel=\xC8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE0 [name] \xED\xE0 \xC2\xE0\xF8 \xF0\xE0\xF7\xF3\xED\xE0\xF0 \xBC\xE5 \xE7\xE0\xE2\xF0\xF8\xE5\xED\xE0. \xCF\xF0\xEE\xE3\xF0\xE0\xEC \xEC\xEE\xE6\xE5\xF2\xE5 \xEF\xEE\xEA\xF0\xE5\xED\xF3\xF2\xE8 \xEF\xF0\xE5\xEA\xEE \xEF\xEE\xF1\xF2\xE0\xE2\x9A\xE5\xED\xE8\xF5 \xE8\xEA\xEE\xED\xE0.
+ClickFinish=\xCF\xF0\xE8\xF2\xE8\xF1\xED\xE8\xF2\xE5 \xC7\xE0\xE2\xF0\xF8\xE5\xF2\xE0\xEA \xE4\xE0 \xE8\xE7\xE0\x90\xE5\xF2\xE5.
+FinishedRestartLabel=\xC4\xE0 \xE1\xE8 \xF1\xE5 \xE8\xED\xF1\xF2\xE0\xEB\xE0\xF6\xE8\xBC\xE0 [name] \xE4\xEE\xE2\xF0\xF8\xE8\xEB\xE0, \xEC\xEE\xF0\xE0 \xF1\xE5 \xF0\xE5\xF1\xF2\xE0\xF0\xF2\xEE\xE2\xE0\xF2\xE8 \xF0\xE0\xF7\xF3\xED\xE0\xF0. \xC4\xE0 \xEB\xE8 \xE6\xE5\xEB\xE8\xF2\xE5 \xE4\xE0 \xE3\xE0 \xF0\xE5\xF1\xF2\xE0\xF0\xF2\xF3\xBC\xE5\xF2\xE5 \xEE\xE4\xEC\xE0\xF5?
+FinishedRestartMessage=\xC4\xE0 \xE1\...
[truncated message content] |
|
From: <ge...@us...> - 2010-06-17 16:40:24
|
Revision: 7196
http://winmerge.svn.sourceforge.net/winmerge/?rev=7196&view=rev
Author: gerundt
Date: 2010-06-17 16:40:17 +0000 (Thu, 17 Jun 2010)
Log Message:
-----------
PATCH: [ 3014912 ] Installer: Set default language with MSI setup
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Installer/WiX/Fragments/Features.wxs
trunk/Installer/WiX/Fragments/Languages.wxs
trunk/Installer/WiX/WinMerge.wxs
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-06-17 05:47:45 UTC (rev 7195)
+++ trunk/Docs/Users/ChangeLog.txt 2010-06-17 16:40:17 UTC (rev 7196)
@@ -5,6 +5,7 @@
WinMerge 2.13.13
Installer: Embed MS runtime files installer for x64 (r7150)
+ Installer: Set default language with MSI setup (#3014912)
Bugfix: Compare by size always checked file times too (#2919510)
Bugfix: Line filtering wasted huge amounts of memory (#3014162)
Bugfix: Difference blocks not cleared after merging (#2995925)
Modified: trunk/Installer/WiX/Fragments/Features.wxs
===================================================================
--- trunk/Installer/WiX/Fragments/Features.wxs 2010-06-17 05:47:45 UTC (rev 7195)
+++ trunk/Installer/WiX/Fragments/Features.wxs 2010-06-17 16:40:17 UTC (rev 7196)
@@ -79,6 +79,7 @@
<ComponentRef Id="Swedish" />
<ComponentRef Id="Turkish" />
<ComponentRef Id="Ukrainian" />
+ <ComponentRef Id="SetDefaultWinMergeLanguage" />
</Feature>
<Feature Id="CRT" AllowAdvertise="no" Display="hidden" Level="1" Title="Microsoft Visual C++ 2005 Runtime Components ">
<MergeRef Id="CRT"/>
Modified: trunk/Installer/WiX/Fragments/Languages.wxs
===================================================================
--- trunk/Installer/WiX/Fragments/Languages.wxs 2010-06-17 05:47:45 UTC (rev 7195)
+++ trunk/Installer/WiX/Fragments/Languages.wxs 2010-06-17 16:40:17 UTC (rev 7196)
@@ -205,6 +205,14 @@
Source="..\..\Translations\WinMerge\Ukrainian.po"
Vital="no" />
</Component>
+
+ <!-- Set the default WinMerge language -->
+ <Component Id="SetDefaultWinMergeLanguage" Guid="*" Win64="$(var.Win64)">
+ <!-- We just write the system language ID to the registry.
+ If WinMerge have no language with this ID, it will fall back to English!
+ This is a little bit lazy but also the easiest way! ;-) -->
+ <RegistryValue Root="HKLM" Key="Software\Thingamahoochie\WinMerge\Locale" Name="LanguageId" Type="integer" Value="[SystemLanguageID]" KeyPath="yes" />
+ </Component>
</DirectoryRef>
</Fragment>
</Wix>
Modified: trunk/Installer/WiX/WinMerge.wxs
===================================================================
--- trunk/Installer/WiX/WinMerge.wxs 2010-06-17 05:47:45 UTC (rev 7195)
+++ trunk/Installer/WiX/WinMerge.wxs 2010-06-17 16:40:17 UTC (rev 7196)
@@ -17,7 +17,6 @@
* Modify Path
* Don't install 32 bit version von Windows x64
* Install translated readme files
- * Set WinMerge language
* Mutli-language support
* ...
-->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2010-06-17 05:47:52
|
Revision: 7195
http://winmerge.svn.sourceforge.net/winmerge/?rev=7195&view=rev
Author: jtuc
Date: 2010-06-17 05:47:45 +0000 (Thu, 17 Jun 2010)
Log Message:
-----------
PATCH: [ 3016907 ] Fix Bug #2968177 Ignoring comments wrongly recognizes // ...
Modified Paths:
--------------
trunk/Src/DiffWrapper.cpp
Modified: trunk/Src/DiffWrapper.cpp
===================================================================
--- trunk/Src/DiffWrapper.cpp 2010-06-14 21:27:35 UTC (rev 7194)
+++ trunk/Src/DiffWrapper.cpp 2010-06-17 05:47:45 UTC (rev 7195)
@@ -324,6 +324,33 @@
}
/**
+ * @brief Find comment marker in string, excluding portions enclosed in quotation marks or apostrophes
+ * @param [in] target - string to search
+ * @param [in] marker - marker to search for
+ * @return Returns position of marker, or NULL if none is present
+ */
+static const char *FindCommentMarker(const char *target, const char *marker)
+{
+ char prev = '\0';
+ char quote = '\0';
+ size_t marker_len = strlen(marker);
+ while (const char c = *target)
+ {
+ if (quote == '\0' && memcmp(target, marker, marker_len) == 0)
+ return target;
+ if ((prev != '\\') &&
+ (c == '"' || c == '\'') &&
+ (quote == '\0' || quote == c))
+ {
+ quote ^= c;
+ }
+ prev = c;
+ ++target;
+ }
+ return NULL;
+}
+
+/**
@brief Performs post-filtering, by setting comment blocks to trivial
@param [in] StartPos - First line number to read
@param [in] EndPos - The line number PASS the last line number to read
@@ -352,16 +379,13 @@
OpShouldBeTrivial = true;
break;
}
- std::string LineData(files[FileNo].linbuf[i]);
- size_t EolPos = LineData.find_first_of(EolIndicators);
- if (EolPos != std::string::npos)
- {
- LineData.erase(EolPos);
- }
- const char * StartOfComment = strstr(LineData.c_str(), filtercommentsset.StartMarker.c_str());
- const char * EndOfComment = strstr(LineData.c_str(), filtercommentsset.EndMarker.c_str());
- const char * InLineComment = strstr(LineData.c_str(), filtercommentsset.InlineMarker.c_str());
+ const char *LineStr = files[FileNo].linbuf[i];
+ std::string LineData(LineStr, linelen(LineStr));
+
+ const char * StartOfComment = FindCommentMarker(LineData.c_str(), filtercommentsset.StartMarker.c_str());
+ const char * EndOfComment = FindCommentMarker(LineData.c_str(), filtercommentsset.EndMarker.c_str());
+ const char * InLineComment = FindCommentMarker(LineData.c_str(), filtercommentsset.InlineMarker.c_str());
//The following logic determines if the entire block is a comment block, and only marks it as trivial
//if all the changes are within a comment block.
if (Direction == -1)
@@ -584,38 +608,33 @@
else if (!filtercommentsset.InlineMarker.empty() && QtyLinesLeft == 1 && QtyLinesRight == 1)
{
//Lets test if only a post line comment is different.
- const char * LineStrLeft = files[0].linbuf[LineNumberLeft];
- const char * EndLineLeft = strchr(LineStrLeft, '\0');
- const char * LineStrRight = files[1].linbuf[LineNumberRight];
- const char * EndLineRight = strchr(LineStrRight, '\0');
- if (EndLineLeft && EndLineRight)
+ const char *LineStrLeft = files[0].linbuf[LineNumberLeft];
+ const char *LineStrRight = files[1].linbuf[LineNumberRight];
+ std::string LineDataLeft(LineStrLeft, linelen(LineStrLeft));
+ std::string LineDataRight(LineStrRight, linelen(LineStrRight));
+ const char *CommentStrLeft = FindCommentMarker(LineDataLeft.c_str(), filtercommentsset.InlineMarker.c_str());
+ const char *CommentStrRight = FindCommentMarker(LineDataRight.c_str(), filtercommentsset.InlineMarker.c_str());
+ //If neither side has comment string, then lets assume significant difference, and return
+ if (CommentStrLeft == NULL && CommentStrRight == NULL)
{
- std::string LineDataLeft(LineStrLeft, EndLineLeft);
- std::string LineDataRight(LineStrRight, EndLineRight);
- size_t CommentStrLeft = LineDataLeft.find(filtercommentsset.InlineMarker);
- size_t CommentStrRight = LineDataRight.find(filtercommentsset.InlineMarker);
- //If neither side has comment string, then lets assume significant difference, and return
- if (CommentStrLeft == std::string::npos && CommentStrRight == std::string::npos)
- {
- return;
- }
- //Do a quick test to see if both sides begin with comment character
- if (!CommentStrLeft && !CommentStrRight)
- {//If both sides begin with comment character, then this is a trivial difference
- Op = OP_TRIVIAL;
- return;
- }
+ return;
+ }
+ //Do a quick test to see if both sides begin with comment character
+ if (CommentStrLeft == LineDataLeft.c_str() && CommentStrRight == LineDataRight.c_str())
+ {//If both sides begin with comment character, then this is a trivial difference
+ Op = OP_TRIVIAL;
+ return;
+ }
- //Lets remove comments, and see if lines are equal
- if (CommentStrLeft != std::string::npos)
- LineDataLeft.erase(CommentStrLeft);
- if (CommentStrRight != std::string::npos)
- LineDataRight.erase(CommentStrRight);
- if (LineDataLeft == LineDataRight)
- {//If they're equal now, then only difference is comments, and that's a trivial difference
- Op = OP_TRIVIAL;
- return;
- }
+ //Lets remove comments, and see if lines are equal
+ if (CommentStrLeft != NULL)
+ LineDataLeft.erase(CommentStrLeft - LineDataLeft.c_str());
+ if (CommentStrRight != NULL)
+ LineDataRight.erase(CommentStrRight - LineDataRight.c_str());
+ if (LineDataLeft == LineDataRight)
+ {//If they're equal now, then only difference is comments, and that's a trivial difference
+ Op = OP_TRIVIAL;
+ return;
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
