|
From: <ki...@us...> - 2006-12-12 22:26:12
|
Revision: 3958
http://svn.sourceforge.net/winmerge/?rev=3958&view=rev
Author: kimmov
Date: 2006-12-12 14:26:09 -0800 (Tue, 12 Dec 2006)
Log Message:
-----------
PATCH: [ 1611060 ] Move constants from Merge.cpp to FileOrFolderSelect.cpp
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/FileOrFolderSelect.cpp
branches/R2_6/Src/Merge.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-12-12 22:17:41 UTC (rev 3957)
+++ branches/R2_6/Src/Changes.txt 2006-12-12 22:26:09 UTC (rev 3958)
@@ -16,6 +16,8 @@
ShellExtension: ShellExtension.rc
PATCH: [ 1610998 ] Splash screen does not stop timer
Src: Splash.cpp
+ PATCH: [ 1611060 ] Move constants from Merge.cpp to FileOrFolderSelect.cpp
+ Src: FileOrFolderSelect.cpp Merge.cpp
2006-12-11 Kimmo
PATCH: [ 1610442 ] Make time getting faster for files
Modified: branches/R2_6/Src/FileOrFolderSelect.cpp
===================================================================
--- branches/R2_6/Src/FileOrFolderSelect.cpp 2006-12-12 22:17:41 UTC (rev 3957)
+++ branches/R2_6/Src/FileOrFolderSelect.cpp 2006-12-12 22:26:09 UTC (rev 3958)
@@ -31,6 +31,19 @@
#include "coretools.h"
#include "paths.h"
+// VC 6 headers don't define these constants for folder browse dialog
+// so define them here. Copied from shlobj.h
+#ifndef BIF_EDITBOX
+#define BIF_EDITBOX 0x0010 // Add an editbox to the dialog
+#endif
+#ifndef BIF_NEWDIALOGSTYLE
+#define BIF_NEWDIALOGSTYLE 0x0040 // Use the new dialog layout with the ability to resize
+ // Caller needs to call OleInitialize() before using this API
+#endif
+#ifndef BIF_USENEWUI
+#define BIF_USENEWUI (BIF_NEWDIALOGSTYLE | BIF_EDITBOX)
+#endif
+
/**
* @brief Helper function for selecting dir/file
* @param [in] parent Handle to parent window. Can be a NULL, but then
Modified: branches/R2_6/Src/Merge.cpp
===================================================================
--- branches/R2_6/Src/Merge.cpp 2006-12-12 22:17:41 UTC (rev 3957)
+++ branches/R2_6/Src/Merge.cpp 2006-12-12 22:26:09 UTC (rev 3958)
@@ -58,20 +58,6 @@
static char THIS_FILE[] = __FILE__;
#endif
-// VC 6 headers don't define these constants for folder browse dialog
-// so define them here. Copied from shlobj.h
-#ifndef BIF_EDITBOX
-#define BIF_EDITBOX 0x0010 // Add an editbox to the dialog
-#endif
-#ifndef BIF_NEWDIALOGSTYLE
-#define BIF_NEWDIALOGSTYLE 0x0040 // Use the new dialog layout with the ability to resize
- // Caller needs to call OleInitialize() before using this API
-#endif
-#ifndef BIF_USENEWUI
-#define BIF_USENEWUI (BIF_NEWDIALOGSTYLE | BIF_EDITBOX)
-#endif
-
-
/////////////////////////////////////////////////////////////////////////////
// CMergeApp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-12-18 22:50:27
|
Revision: 3978
http://svn.sourceforge.net/winmerge/?rev=3978&view=rev
Author: kimmov
Date: 2006-12-18 14:50:24 -0800 (Mon, 18 Dec 2006)
Log Message:
-----------
BUG: [ 1602219 ] Crappy save of project files
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/MainFrm.cpp
branches/R2_6/Src/ProjectFilePathsDlg.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-12-18 21:07:47 UTC (rev 3977)
+++ branches/R2_6/Src/Changes.txt 2006-12-18 22:50:24 UTC (rev 3978)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-12-18 Kimmo
+ BUG: [ 1602219 ] Crappy save of project files
+ Src: MainFrm.cpp ProjectFilePathsDlg.cpp
+
2006-12-14 2.6.2 Stable Release (R3963)
2006-12-12 Kimmo
Modified: branches/R2_6/Src/MainFrm.cpp
===================================================================
--- branches/R2_6/Src/MainFrm.cpp 2006-12-18 21:07:47 UTC (rev 3977)
+++ branches/R2_6/Src/MainFrm.cpp 2006-12-18 22:50:24 UTC (rev 3978)
@@ -3003,6 +3003,8 @@
/**
* @brief Opens dialog for user to Load, edit and save project files.
+ * This dialog gets current compare paths and filter (+other properties
+ * possible in project files) and initializes the dialog with them.
*/
void CMainFrame::OnSaveProject()
{
@@ -3028,15 +3030,16 @@
}
else if (bDirFrame)
{
+ // Get paths currently in compare
CDirDoc * pDoc = (CDirDoc*)pFrame->GetActiveDocument();
- CDirView *pView = pDoc->GetMainView();
- // Use first item if no item is selected.
- int ind = max(pView->GetFirstSelectedInd(), 0);
- const DIFFITEM item = pView->GetItemAt(ind);
- left = item.getLeftFilepath(pDoc->GetLeftBasePath());
- left += "\\";
- right = item.getRightFilepath(pDoc->GetRightBasePath());
- right += "\\";
+ left = pDoc->GetLeftBasePath();
+ right = pDoc->GetRightBasePath();
+ if (!paths_EndsWithSlash(left))
+ left += _T("\\");
+ if (!paths_EndsWithSlash(right))
+ right += _T("\\");
+
+ // Set-up the dialog
pathsDlg.SetPaths(left, right);
pathsDlg.m_bIncludeSubfolders = pDoc->GetRecursive();
pathsDlg.m_bLeftPathReadOnly = pDoc->GetReadOnly(TRUE);
Modified: branches/R2_6/Src/ProjectFilePathsDlg.cpp
===================================================================
--- branches/R2_6/Src/ProjectFilePathsDlg.cpp 2006-12-18 21:07:47 UTC (rev 3977)
+++ branches/R2_6/Src/ProjectFilePathsDlg.cpp 2006-12-18 22:50:24 UTC (rev 3978)
@@ -207,16 +207,30 @@
/**
* @brief Set paths for dialog.
- * This function is used to set paths from outside the dialog.
+ * This function is used to set paths from outside the dialog. The dialog
+ * only accepts existing paths, as we expect paths coming from existing
+ * compare windows.
* @param [in] left Left path.
* @param [in] right Right path.
*/
void ProjectFilePathsDlg::SetPaths(LPCTSTR left, LPCTSTR right)
{
if (left != NULL)
- m_sLeftFile = left;
+ {
+ PATH_EXISTENCE pe = paths_DoesPathExist(left);
+ if (pe != DOES_NOT_EXIST)
+ {
+ m_sLeftFile = left;
+ }
+ }
if (right != NULL)
- m_sRightFile = right;
+ {
+ PATH_EXISTENCE pe = paths_DoesPathExist(right);
+ if (pe != DOES_NOT_EXIST)
+ {
+ m_sRightFile = right;
+ }
+ }
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2007-01-10 13:44:51
|
Revision: 4022
http://svn.sourceforge.net/winmerge/?rev=4022&view=rev
Author: galh
Date: 2007-01-10 05:44:44 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
PATCH: [ 1631215 ] Remove used files
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Merge.dsp
Removed Paths:
-------------
branches/R2_6/Src/Common/listvwex.cpp
branches/R2_6/Src/Common/listvwex.h
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-01-08 20:48:23 UTC (rev 4021)
+++ branches/R2_6/Src/Changes.txt 2007-01-10 13:44:44 UTC (rev 4022)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-10 Gal
+ PATCH: [ 1631215 ] Remove used files
+ Src: Merge.dsp
+ Src/Common deleted: listvwex.cpp listvwex.h
+
2006-12-20 Kimmo
BUG: [ 1619689 ] Filefilter: ASP.NET Devel
Filters: ASPNET.flt
Deleted: branches/R2_6/Src/Common/listvwex.cpp
===================================================================
--- branches/R2_6/Src/Common/listvwex.cpp 2007-01-08 20:48:23 UTC (rev 4021)
+++ branches/R2_6/Src/Common/listvwex.cpp 2007-01-10 13:44:44 UTC (rev 4022)
@@ -1,547 +0,0 @@
-// ListVwEx.cpp : implementation of the CListViewEx class
-//
-// This is a part of the Microsoft Foundation Classes C++ library.
-// Copyright (C) 1992-1996 Microsoft Corporation
-// All rights reserved.
-//
-// This source code is only intended as a supplement to the
-// Microsoft Foundation Classes Reference and related
-// electronic documentation provided with the library.
-// See these sources for detailed information regarding the
-// Microsoft Foundation Classes product.
-
-#include "stdafx.h"
-#include "ListVwEx.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CListViewEx
-
-IMPLEMENT_DYNCREATE(CListViewEx, CListView)
-
-BEGIN_MESSAGE_MAP(CListViewEx, CListView)
- //{{AFX_MSG_MAP(CListViewEx)
- ON_WM_SIZE()
- ON_WM_PAINT()
- ON_WM_SETFOCUS()
- ON_WM_KILLFOCUS()
- //}}AFX_MSG_MAP
- ON_MESSAGE(LVM_SETIMAGELIST, OnSetImageList)
- ON_MESSAGE(LVM_SETTEXTCOLOR, OnSetTextColor)
- ON_MESSAGE(LVM_SETTEXTBKCOLOR, OnSetTextBkColor)
- ON_MESSAGE(LVM_SETBKCOLOR, OnSetBkColor)
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CListViewEx construction/destruction
-
-BOOL CListViewEx::PreCreateWindow(CREATESTRUCT& cs)
-{
- // default is report view and full row selection
- cs.style&=~LVS_TYPEMASK;
- cs.style|=LVS_REPORT | LVS_OWNERDRAWFIXED;
-
- return(CListView::PreCreateWindow(cs));
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CListCtrlEx
-
-IMPLEMENT_DYNCREATE(CListCtrlEx, CListCtrl)
-
-BEGIN_MESSAGE_MAP(CListCtrlEx, CListCtrl)
- //{{AFX_MSG_MAP(CListCtrlEx)
- ON_WM_SIZE()
- ON_WM_PAINT()
- ON_WM_SETFOCUS()
- ON_WM_KILLFOCUS()
- //}}AFX_MSG_MAP
- ON_MESSAGE(LVM_SETIMAGELIST, OnSetImageList)
- ON_MESSAGE(LVM_SETTEXTCOLOR, OnSetTextColor)
- ON_MESSAGE(LVM_SETTEXTBKCOLOR, OnSetTextBkColor)
- ON_MESSAGE(LVM_SETBKCOLOR, OnSetBkColor)
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CListCtrlEx construction/destruction
-
-CListCtrlEx::CListCtrlEx()
-#pragma warning(disable:4355) // 'this' : used in base member initializer list
-: m_listex(*this)
-#pragma warning(default:4355) // 'this' : used in base member initializer list
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CListEx
-
-BOOL CListEx::SetFullRowSel(BOOL bFullRowSel)
-{
- CListCtrl& ListCtrl=GetListCtrl();
-
- // no painting during change
- ListCtrl.LockWindowUpdate();
-
- m_bFullRowSel=bFullRowSel;
-
- BOOL bRet;
-
- if(m_bFullRowSel)
- bRet=ListCtrl.ModifyStyle(0L,LVS_OWNERDRAWFIXED);
- else
- bRet=ListCtrl.ModifyStyle(LVS_OWNERDRAWFIXED,0L);
-
- // repaint window if we are not changing view type
- if(bRet && (ListCtrl.GetStyle() & LVS_TYPEMASK)==LVS_REPORT)
- ListCtrl.Invalidate();
-
- // repaint changes
- ListCtrl.UnlockWindowUpdate();
-
- return(bRet);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CListEx drawing
-
-// offsets for first and other columns
-#define OFFSET_FIRST 2
-#define OFFSET_OTHER 6
-
-void CListEx::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct)
-{
- CListCtrl& ListCtrl=GetListCtrl();
- CDC* pDC=CDC::FromHandle(lpDrawItemStruct->hDC);
- CRect rcItem(lpDrawItemStruct->rcItem);
- UINT uiFlags=ILD_TRANSPARENT;
- CImageList* pImageList;
- int nItem=lpDrawItemStruct->itemID;
- BOOL bFocus=(ListCtrl.GetFocus()==&ListCtrl);
- COLORREF clrTextSave, clrBkSave;
- COLORREF clrImage=m_clrBkgnd;
- static _TCHAR szBuff[MAX_PATH];
- LPCTSTR pszText;
-
-// get item data
-
- LV_ITEM lvi;
- lvi.mask=LVIF_TEXT | LVIF_IMAGE | LVIF_STATE;
- lvi.iItem=nItem;
- lvi.iSubItem=0;
- lvi.pszText=szBuff;
- lvi.cchTextMax=sizeof(szBuff);
- lvi.stateMask=0xFFFF; // get all state flags
- ListCtrl.GetItem(&lvi);
-
- BOOL bSelected=(bFocus || (ListCtrl.GetStyle() & LVS_SHOWSELALWAYS)) && lvi.state & LVIS_SELECTED;
- bSelected=bSelected || (lvi.state & LVIS_DROPHILITED);
-
-// set colors if item is selected
-
- CRect rcAllLabels;
- ListCtrl.GetItemRect(nItem,rcAllLabels,LVIR_BOUNDS);
- CRect rcLabel;
- ListCtrl.GetItemRect(nItem,rcLabel,LVIR_LABEL);
- rcAllLabels.left=rcLabel.left;
- if(m_bClientWidthSel && rcAllLabels.right<m_cxClient)
- rcAllLabels.right=m_cxClient;
-
- if(bSelected)
- {
- clrTextSave=pDC->SetTextColor(::GetSysColor(COLOR_HIGHLIGHTTEXT));
- clrBkSave=pDC->SetBkColor(::GetSysColor(COLOR_HIGHLIGHT));
- CBrush brush(::GetSysColor(COLOR_HIGHLIGHT));
- pDC->FillRect(rcAllLabels,&brush);
- }
- else
- {
- clrTextSave=pDC->SetTextColor(m_clrText);
- clrBkSave=pDC->SetBkColor(m_clrTextBk);
- CBrush brush(m_clrTextBk);
- pDC->FillRect(rcAllLabels,&brush);
- }
-
-// set color and mask for the icon
-
- if(lvi.state & LVIS_CUT)
- {
- clrImage=m_clrBkgnd;
- uiFlags|=ILD_BLEND50;
- }
- else if(bSelected)
- {
- clrImage=::GetSysColor(COLOR_HIGHLIGHT);
- uiFlags|=ILD_BLEND50;
- }
-
-// draw state icon
-
- UINT nStateImageMask=lvi.state & LVIS_STATEIMAGEMASK;
- if(nStateImageMask)
- {
- int nImage=(nStateImageMask>>12)-1;
- pImageList=ListCtrl.GetImageList(LVSIL_STATE);
- if(pImageList)
- pImageList->Draw(pDC,nImage,CPoint(rcItem.left,rcItem.top),ILD_TRANSPARENT);
- }
-
-// draw normal and overlay icon
-
- CRect rcIcon;
- ListCtrl.GetItemRect(nItem,rcIcon,LVIR_ICON);
-
- pImageList=ListCtrl.GetImageList(LVSIL_SMALL);
- if(pImageList)
- {
- UINT nOvlImageMask=lvi.state & LVIS_OVERLAYMASK;
- if(rcItem.left<rcItem.right-1)
- ImageList_DrawEx(pImageList->m_hImageList,lvi.iImage,pDC->m_hDC,rcIcon.left,rcIcon.top,16,16,m_clrBkgnd,clrImage,uiFlags | nOvlImageMask);
- }
-
-// draw item label
-
- ListCtrl.GetItemRect(nItem,rcItem,LVIR_LABEL);
- rcItem.right-=m_cxStateImageOffset;
-
- pszText=MakeShortString(pDC,szBuff,rcItem.right-rcItem.left,2*OFFSET_FIRST);
-
- rcLabel=rcItem;
- rcLabel.left+=OFFSET_FIRST;
- rcLabel.right-=OFFSET_FIRST;
-
- pDC->DrawText(pszText,-1,rcLabel, m_nTabFlag | DT_LEFT | DT_SINGLELINE | DT_NOPREFIX | DT_NOCLIP | DT_VCENTER);
-
-// draw labels for extra columns
-
- LV_COLUMN lvc;
- lvc.mask=LVCF_FMT | LVCF_WIDTH;
-
- for(int nColumn=1; ListCtrl.GetColumn(nColumn,&lvc); nColumn++)
- {
- rcItem.left=rcItem.right;
- rcItem.right+=lvc.cx;
-
- int nRetLen=ListCtrl.GetItemText(nItem,nColumn,szBuff,sizeof(szBuff));
- if(nRetLen==0) continue;
-
- pszText=MakeShortString(pDC,szBuff,rcItem.right-rcItem.left,2*OFFSET_OTHER);
-
- UINT nJustify=DT_LEFT;
-
- if(pszText==szBuff)
- {
- switch(lvc.fmt & LVCFMT_JUSTIFYMASK)
- {
- case LVCFMT_RIGHT:
- nJustify=DT_RIGHT;
- break;
- case LVCFMT_CENTER:
- nJustify=DT_CENTER;
- break;
- default:
- break;
- }
- }
-
- rcLabel=rcItem;
- rcLabel.left+=OFFSET_OTHER;
- rcLabel.right-=OFFSET_OTHER;
-
- pDC->DrawText(pszText,-1,rcLabel,nJustify | DT_SINGLELINE | DT_NOPREFIX | DT_NOCLIP | DT_VCENTER);
- }
-
-// draw focus rectangle if item has focus
-
- if(lvi.state & LVIS_FOCUSED && bFocus)
- pDC->DrawFocusRect(rcAllLabels);
-
-// set original colors
- pDC->SetTextColor(clrTextSave);
- pDC->SetBkColor(clrBkSave);
-}
-
-LPCTSTR CListEx::MakeShortString(CDC* pDC, LPCTSTR lpszLong, int nColumnLen, int nOffset)
-{
- static const _TCHAR szThreeDots[]=_T("...");
-
- int nStringLen=lstrlen(lpszLong);
-
- CSize ext;
- if (m_nTabFlag == DT_EXPANDTABS)
- ext = pDC->GetTabbedTextExtent(lpszLong,nStringLen, 0, NULL);
- else
- ext = pDC->GetTextExtent(lpszLong,nStringLen);
- if(nStringLen==0 || ext.cx+nOffset<=nColumnLen)
- return(lpszLong);
-
- static _TCHAR szShort[MAX_PATH];
-
- lstrcpy(szShort,lpszLong);
- int nAddLen=pDC->GetTextExtent(szThreeDots,sizeof(szThreeDots)).cx;
-
- for(int i=nStringLen-1; i>0; i--)
- {
- szShort[i]=0;
- if (m_nTabFlag == DT_EXPANDTABS)
- ext = pDC->GetTabbedTextExtent(szShort,i, 0, NULL);
- else
- ext = pDC->GetTextExtent(szShort,i);
- if(ext.cx+nOffset+nAddLen<=nColumnLen)
- break;
- }
-
- lstrcat(szShort,szThreeDots);
-
- return(szShort);
-}
-
-void CListEx::RepaintSelectedItems()
-{
- CListCtrl& ListCtrl=GetListCtrl();
- CRect rcItem, rcLabel;
-
-// invalidate focused item so it can repaint properly
-
- int nItem=ListCtrl.GetNextItem(-1,LVNI_FOCUSED);
-
- if(nItem!=-1)
- {
- ListCtrl.GetItemRect(nItem,rcItem,LVIR_BOUNDS);
- ListCtrl.GetItemRect(nItem,rcLabel,LVIR_LABEL);
- rcItem.left=rcLabel.left;
-
- ListCtrl.InvalidateRect(rcItem,FALSE);
- }
-
-// if selected items should not be preserved, invalidate them
-
- if(!(ListCtrl.GetStyle() & LVS_SHOWSELALWAYS))
- {
- for(nItem=ListCtrl.GetNextItem(-1,LVNI_SELECTED);
- nItem!=-1; nItem=ListCtrl.GetNextItem(nItem,LVNI_SELECTED))
- {
- ListCtrl.GetItemRect(nItem,rcItem,LVIR_BOUNDS);
- ListCtrl.GetItemRect(nItem,rcLabel,LVIR_LABEL);
- rcItem.left=rcLabel.left;
-
- ListCtrl.InvalidateRect(rcItem,FALSE);
- }
- }
-
-// update changes
-
- ListCtrl.UpdateWindow();
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CListEx diagnostics
-
-#ifdef _DEBUG
-
-void CListEx::Dump(CDumpContext& dc) const
-{
- dc << "m_bFullRowSel = " << (UINT)m_bFullRowSel;
- dc << "\n";
- dc << "m_cxStateImageOffset = " << m_cxStateImageOffset;
- dc << "\n";
-}
-
-#endif //_DEBUG
-
-/////////////////////////////////////////////////////////////////////////////
-// CListViewEx message handlers
-
-// Class to allow public calls to CWnd::Default
-class WndAccess : public CWnd
-{
-protected:
- LRESULT CallWndDefault() { return CWnd::Default(); }
-public:
- static LRESULT CallDefault(CWnd * pwnd)
- {
- WndAccess * pw = (WndAccess *)pwnd;
- return pw->CallWndDefault();
- }
-};
-
-LRESULT CListEx::Default()
-{
- CListCtrl& ListCtrl=GetListCtrl();
- return WndAccess::CallDefault(&ListCtrl);
-}
-
-LRESULT CListEx::OnSetImageList(WPARAM wParam, LPARAM lParam)
-{
- CListCtrl& ListCtrl=GetListCtrl();
- if((int)wParam==LVSIL_STATE)
- {
- int cx, cy;
-
- if(::ImageList_GetIconSize((HIMAGELIST)lParam,&cx,&cy))
- m_cxStateImageOffset=cx;
- else
- m_cxStateImageOffset=0;
- }
-
- return(Default());
-}
-
-LRESULT CListEx::OnSetTextColor(WPARAM /*wParam*/, LPARAM lParam)
-{
- CListCtrl& ListCtrl=GetListCtrl();
- m_clrText=(COLORREF)lParam;
- return(Default());
-}
-
-LRESULT CListEx::OnSetTextBkColor(WPARAM /*wParam*/, LPARAM lParam)
-{
- m_clrTextBk=(COLORREF)lParam;
- return(Default());
-}
-
-LRESULT CListEx::OnSetBkColor(WPARAM /*wParam*/, LPARAM lParam)
-{
- m_clrBkgnd=(COLORREF)lParam;
- return(Default());
-}
-
-void CListEx::OnSize(UINT nType, int cx, int cy)
-{
- m_cxClient=cx;
-}
-
-void CListEx::OnPaint()
-{
- CListCtrl& ListCtrl=GetListCtrl();
- // in full row select mode, we need to extend the clipping region
- // so we can paint a selection all the way to the right
- if(m_bClientWidthSel && (ListCtrl.GetStyle() & LVS_TYPEMASK)==LVS_REPORT && GetFullRowSel())
- {
- CRect rcAllLabels;
- GetListCtrl().GetItemRect(0,rcAllLabels,LVIR_BOUNDS);
-
- if(rcAllLabels.right<m_cxClient)
- {
- // need to call BeginPaint (in CPaintDC c-tor)
- // to get correct clipping rect
- CPaintDC dc(&ListCtrl);
-
- CRect rcClip;
- dc.GetClipBox(rcClip);
-
- rcClip.left=min(rcAllLabels.right-1,rcClip.left);
- rcClip.right=m_cxClient;
-
- ListCtrl.InvalidateRect(rcClip,FALSE);
- // EndPaint will be called in CPaintDC d-tor
- }
- }
-}
-
-void CListEx::OnSetFocus(CWnd* pOldWnd)
-{
- CListCtrl& ListCtrl=GetListCtrl();
-
- // check if we are getting focus from label edit box
- if(pOldWnd!=NULL && pOldWnd->GetParent()==&ListCtrl)
- return;
-
- // repaint items that should change appearance
- if(m_bFullRowSel && (ListCtrl.GetStyle() & LVS_TYPEMASK)==LVS_REPORT)
- RepaintSelectedItems();
-}
-
-void CListEx::OnKillFocus(CWnd* pNewWnd)
-{
- CListCtrl& ListCtrl=GetListCtrl();
-
- // check if we are losing focus to label edit box
- if(pNewWnd!=NULL && pNewWnd->GetParent()==&ListCtrl)
- return;
-
- // repaint items that should change appearance
- if(m_bFullRowSel && (ListCtrl.GetStyle() & LVS_TYPEMASK)==LVS_REPORT)
- RepaintSelectedItems();
-}
-
-
-void CListEx::AddItem(int nItem,int nSubItem,LPCTSTR strItem)
-{
- LV_ITEM lvItem;
- lvItem.mask = LVIF_TEXT;
- lvItem.iItem = nItem;
-
- lvItem.iSubItem = nSubItem;
- lvItem.pszText = (LPTSTR)strItem;
-
- CListCtrl& lc = GetListCtrl();
- if(lvItem.iSubItem == 0)
- lc.InsertItem(&lvItem);
- else
- lc.SetItem(&lvItem);
-}
-
-
-void CListEx::SetImage(int nItem, UINT nImage)
-{
- LV_ITEM lvItem;
- lvItem.mask = LVIF_IMAGE;
- lvItem.iItem = nItem;
- lvItem.iSubItem = 0;
- lvItem.iImage = nImage;
-
- GetListCtrl().SetItem(&lvItem);
-}
-
-void CListEx::ClearSelection()
-{
- CListCtrl& ctl = GetListCtrl();
- int sel = -1;
-
- while ((sel=ctl.GetNextItem(sel, LVNI_SELECTED)) != -1)
- {
- ctl.SetItemState(sel, 0, LVIS_SELECTED);
- }
-}
-
-void CListEx::SelectItems(int nFirst, int nLast, BOOL bSelected /*=TRUE*/)
-{
- CListCtrl& ctl = GetListCtrl();
- int first = min(nFirst, nLast);
- int last = max(nFirst, nLast);
- UINT state = bSelected? LVIS_SELECTED : 0;
-
- for (int i=first; i <= last; i++)
- ctl.SetItemState(i, state, LVIS_SELECTED);
-}
-
-int CListEx::InsertColumn(int nCol, DWORD idstrColumnHeading, int nFormat /*= LVCFMT_LEFT*/, int nWidth /*= -1*/, int nSubItem /*= -1*/)
-{
- CString s;
- CListCtrl& ctl = GetListCtrl();
- s.LoadString(idstrColumnHeading);
- return ctl.InsertColumn(nCol, s, nFormat, nWidth, nSubItem);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CListEx construction/destruction
-CListEx::CListEx(CListCtrl & listctrl)
-: m_listctrl(listctrl)
-{
- m_bFullRowSel=TRUE;
- m_bClientWidthSel=TRUE;
-
- m_cxClient=0;
- m_cxStateImageOffset=0;
-
- m_clrText=::GetSysColor(COLOR_WINDOWTEXT);
- m_clrTextBk=::GetSysColor(COLOR_WINDOW);
- m_clrBkgnd=::GetSysColor(COLOR_WINDOW);
- m_nTabFlag = DT_EXPANDTABS;
-}
-
Deleted: branches/R2_6/Src/Common/listvwex.h
===================================================================
--- branches/R2_6/Src/Common/listvwex.h 2007-01-08 20:48:23 UTC (rev 4021)
+++ branches/R2_6/Src/Common/listvwex.h 2007-01-10 13:44:44 UTC (rev 4022)
@@ -1,251 +0,0 @@
-// ListVwEx.h : interface of the CListViewEx class
-//
-// This class provedes a full row selection mode for the report
-// mode list view control.
-//
-// This is a part of the Microsoft Foundation Classes C++ library.
-// Copyright (C) 1992-1996 Microsoft Corporation
-// All rights reserved.
-//
-// This source code is only intended as a supplement to the
-// Microsoft Foundation Classes Reference and related
-// electronic documentation provided with the library.
-// See these sources for detailed information regarding the
-// Microsoft Foundation Classes product.
-#ifndef LISTVIEWEX_H
-#define LISTVIEWEX_H
-
-class CListEx
-{
- friend class CListViewEx;
- friend class CListCtrlEx;
-
-// Construction
-public:
- CListEx(CListCtrl & listctrl);
-
-public:
- void SetExpandTabs(BOOL bExpand) { m_nTabFlag = bExpand? DT_EXPANDTABS : 0; }
- BOOL SetFullRowSel(BOOL bFillRowSel);
- BOOL GetFullRowSel() const { return m_bFullRowSel; }
- void AddItem(int nItem,int nSubItem,LPCTSTR strItem);
- void SetImage(int nItem, UINT nImage);
-
-public:
- void DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct);
-
- int InsertColumn( int nCol, DWORD idstrColumnHeading, int nFormat = LVCFMT_LEFT, int nWidth = -1, int nSubItem = -1 );
- void SelectItems(int nFirst, int nLast, BOOL bSelected = TRUE);
- void ClearSelection();
- virtual ~CListEx() { }
-#ifdef _DEBUG
- virtual void Dump(CDumpContext& dc) const;
-#endif
-
-protected:
- LPCTSTR MakeShortString(CDC* pDC, LPCTSTR lpszLong, int nColumnLen, int nOffset);
- void RepaintSelectedItems();
-
-
-// Implementation - state icon width
- afx_msg LRESULT OnSetImageList(WPARAM wParam, LPARAM lParam);
-
-// Implementation - list view colors
- afx_msg LRESULT OnSetTextColor(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnSetTextBkColor(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnSetBkColor(WPARAM wParam, LPARAM lParam);
-
-// message map functions
-protected:
- afx_msg void OnSize(UINT nType, int cx, int cy);
- afx_msg void OnPaint();
- afx_msg void OnSetFocus(CWnd* pOldWnd);
- afx_msg void OnKillFocus(CWnd* pNewWnd);
-
- LRESULT Default();
-
-
-// Attributes
-protected:
- BOOL m_bFullRowSel;
- UINT m_nTabFlag;
-
- BOOL m_bClientWidthSel;
-
-// Implementation - client area width
- int m_cxClient;
-
-// Implementation - state icon width
- int m_cxStateImageOffset;
-
-// Implementation - list view colors
- COLORREF m_clrText;
- COLORREF m_clrTextBk;
- COLORREF m_clrBkgnd;
-
-// Implementation - MFC object bound to window
- CListCtrl & m_listctrl;
- CListCtrl & GetListCtrl() { return m_listctrl; }
-};
-
-
-#include <afxcview.h>
-
-class CListViewEx : public CListView
-{
- DECLARE_DYNCREATE(CListViewEx)
-
-// Construction
-public:
- CListViewEx() : m_listex(GetListCtrl()) { }
-
-public:
- void SetExpandTabs(BOOL bExpand)
- { m_listex.SetExpandTabs(bExpand); }
- BOOL SetFullRowSel(BOOL bFillRowSel)
- { return m_listex.SetFullRowSel(bFillRowSel); }
- BOOL GetFullRowSel() const
- { return m_listex.GetFullRowSel(); }
- void AddItem(int nItem,int nSubItem, LPCTSTR strItem)
- { m_listex.AddItem(nItem, nSubItem, strItem); }
- void SetImage(int nItem, UINT nImage)
- { m_listex.SetImage(nItem, nImage); }
-
-// Overrides
-protected:
- virtual void DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct)
- { m_listex.DrawItem(lpDrawItemStruct); }
-
- // ClassWizard generated virtual function overrides
- //{{AFX_VIRTUAL(CListViewEx)
- public:
- virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
- protected:
- //}}AFX_VIRTUAL
-
-// Implementation
-public:
- int InsertColumn( int nCol, DWORD idstrColumnHeading, int nFormat = LVCFMT_LEFT, int nWidth = -1, int nSubItem = -1 )
- { return m_listex.InsertColumn(nCol, idstrColumnHeading, nFormat, nWidth, nSubItem); }
- void SelectItems(int nFirst, int nLast, BOOL bSelected = TRUE)
- { m_listex.SelectItems(nFirst, nLast, bSelected); }
- void ClearSelection()
- { m_listex.ClearSelection(); }
- virtual ~CListViewEx() { }
-#ifdef _DEBUG
- virtual void Dump(CDumpContext& dc) const
- { CListView::Dump(dc); m_listex.Dump(dc); }
-#endif
-
-protected:
- LPCTSTR MakeShortString(CDC* pDC, LPCTSTR lpszLong, int nColumnLen, int nOffset)
- { return m_listex.MakeShortString(pDC, lpszLong, nColumnLen, nOffset); }
- void RepaintSelectedItems()
- { m_listex.RepaintSelectedItems(); }
-
-
-// Implementation - state icon width
- afx_msg LRESULT OnSetImageList(WPARAM wParam, LPARAM lParam)
- { return m_listex.OnSetImageList(wParam, lParam); }
-
-// Implementation - list view colors
- afx_msg LRESULT OnSetTextColor(WPARAM wParam, LPARAM lParam)
- { return m_listex.OnSetTextColor(wParam, lParam); }
- afx_msg LRESULT OnSetTextBkColor(WPARAM wParam, LPARAM lParam)
- { return m_listex.OnSetTextBkColor(wParam, lParam); }
- afx_msg LRESULT OnSetBkColor(WPARAM wParam, LPARAM lParam)
- { return m_listex.OnSetBkColor(wParam, lParam); }
-
-// Generated message map functions
-protected:
- //{{AFX_MSG(CListViewEx)
- afx_msg void OnSize(UINT nType, int cx, int cy) { m_listex.OnSize(nType, cx, cy); CListView::OnSize(nType, cx, cy); }
- afx_msg void OnPaint() { m_listex.OnPaint(); CListView::OnPaint(); }
- afx_msg void OnSetFocus(CWnd* pOldWnd) { CListView::OnSetFocus(pOldWnd); m_listex.OnSetFocus(pOldWnd); }
- afx_msg void OnKillFocus(CWnd* pNewWnd) { CListView::OnKillFocus(pNewWnd); m_listex.OnKillFocus(pNewWnd); }
- //}}AFX_MSG
- DECLARE_MESSAGE_MAP()
-
-private:
- CListEx m_listex;
-};
-
-class CListCtrlEx : public CListCtrl
-{
- DECLARE_DYNCREATE(CListCtrlEx)
-
-// Construction
-public:
- CListCtrlEx();
-
-public:
- void SetExpandTabs(BOOL bExpand)
- { m_listex.SetExpandTabs(bExpand); }
- BOOL SetFullRowSel(BOOL bFillRowSel)
- { return m_listex.SetFullRowSel(bFillRowSel); }
- BOOL GetFullRowSel() const
- { return m_listex.GetFullRowSel(); }
- void AddItem(int nItem,int nSubItem, LPCTSTR strItem)
- { m_listex.AddItem(nItem, nSubItem, strItem); }
- void SetImage(int nItem, UINT nImage)
- { m_listex.SetImage(nItem, nImage); }
-
-// Overrides
-protected:
- virtual void DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct)
- { m_listex.DrawItem(lpDrawItemStruct); }
-
- // ClassWizard generated virtual function overrides
- //{{AFX_VIRTUAL(CListCtrlEx)
- public:
- protected:
- //}}AFX_VIRTUAL
-
-// Implementation
-public:
- int InsertColumn( int nCol, DWORD idstrColumnHeading, int nFormat = LVCFMT_LEFT, int nWidth = -1, int nSubItem = -1 )
- { return m_listex.InsertColumn(nCol, idstrColumnHeading, nFormat, nWidth, nSubItem); }
- void SelectItems(int nFirst, int nLast, BOOL bSelected = TRUE)
- { m_listex.SelectItems(nFirst, nLast, bSelected); }
- void ClearSelection()
- { m_listex.ClearSelection(); }
- virtual ~CListCtrlEx() { }
-#ifdef _DEBUG
- virtual void Dump(CDumpContext& dc) const
- { CListCtrl::Dump(dc); m_listex.Dump(dc); }
-#endif
-
-protected:
- LPCTSTR MakeShortString(CDC* pDC, LPCTSTR lpszLong, int nColumnLen, int nOffset)
- { return m_listex.MakeShortString(pDC, lpszLong, nColumnLen, nOffset); }
- void RepaintSelectedItems()
- { m_listex.RepaintSelectedItems(); }
-
-// Implementation - state icon width
- afx_msg LRESULT OnSetImageList(WPARAM wParam, LPARAM lParam)
- { return m_listex.OnSetImageList(wParam, lParam); }
-
-// Implementation - list view colors
- afx_msg LRESULT OnSetTextColor(WPARAM wParam, LPARAM lParam)
- { return m_listex.OnSetTextColor(wParam, lParam); }
- afx_msg LRESULT OnSetTextBkColor(WPARAM wParam, LPARAM lParam)
- { return m_listex.OnSetTextBkColor(wParam, lParam); }
- afx_msg LRESULT OnSetBkColor(WPARAM wParam, LPARAM lParam)
- { return m_listex.OnSetBkColor(wParam, lParam); }
-
-// Generated message map functions
-protected:
- //{{AFX_MSG(CListCtrlEx)
- afx_msg void OnSize(UINT nType, int cx, int cy) { m_listex.OnSize(nType, cx, cy); CListCtrl::OnSize(nType, cx, cy); }
- afx_msg void OnPaint() { m_listex.OnPaint(); CListCtrl::OnPaint(); }
- afx_msg void OnSetFocus(CWnd* pOldWnd) { CListCtrl::OnSetFocus(pOldWnd); m_listex.OnSetFocus(pOldWnd); }
- afx_msg void OnKillFocus(CWnd* pNewWnd) { CListCtrl::OnKillFocus(pNewWnd); m_listex.OnKillFocus(pNewWnd); }
- //}}AFX_MSG
- DECLARE_MESSAGE_MAP()
-
-private:
- CListEx m_listex;
-};
-
-#endif
-/////////////////////////////////////////////////////////////////////////////
Modified: branches/R2_6/Src/Merge.dsp
===================================================================
--- branches/R2_6/Src/Merge.dsp 2007-01-08 20:48:23 UTC (rev 4021)
+++ branches/R2_6/Src/Merge.dsp 2007-01-10 13:44:44 UTC (rev 4022)
@@ -461,10 +461,6 @@
# End Source File
# Begin Source File
-SOURCE=.\Common\listvwex.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\LoadSaveCodepageDlg.cpp
# End Source File
# Begin Source File
@@ -1205,10 +1201,6 @@
# End Source File
# Begin Source File
-SOURCE=.\Common\listvwex.h
-# End Source File
-# Begin Source File
-
SOURCE=.\LoadSaveCodepageDlg.h
# End Source File
# Begin Source File
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2007-01-10 14:18:51
|
Revision: 4026
http://svn.sourceforge.net/winmerge/?rev=4026&view=rev
Author: sdottaka
Date: 2007-01-10 06:18:48 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
BUG: [ 1630630 ] Unexpected selection of text after changing pane
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/MergeEditView.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-01-10 14:12:58 UTC (rev 4025)
+++ branches/R2_6/Src/Changes.txt 2007-01-10 14:18:48 UTC (rev 4026)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-10 Takashi
+ BUG: [ 1630630 ] Unexpected selection of text after changing pane
+ Src: MergeEditView.cpp
+
2007-01-10 Gal
PATCH: [ 1631215 ] Remove used files
Src: Merge.dsp
Modified: branches/R2_6/Src/MergeEditView.cpp
===================================================================
--- branches/R2_6/Src/MergeEditView.cpp 2007-01-10 14:12:58 UTC (rev 4025)
+++ branches/R2_6/Src/MergeEditView.cpp 2007-01-10 14:18:48 UTC (rev 4026)
@@ -2184,6 +2184,8 @@
if (ptCursor.y >= pWnd->GetLineCount())
ptCursor.y = pWnd->GetLineCount() - 1;
pWnd->SetCursorPos(ptCursor);
+ pWnd->SetAnchor(ptCursor);
+ pWnd->SetSelection(ptCursor, ptCursor);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2007-01-10 15:11:00
|
Revision: 4028
http://svn.sourceforge.net/winmerge/?rev=4028&view=rev
Author: sdottaka
Date: 2007-01-10 07:10:53 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
BUG: [ 1631613 ] WinMerge crashes when editing code files
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/editlib/ccrystaleditview.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-01-10 15:10:02 UTC (rev 4027)
+++ branches/R2_6/Src/Changes.txt 2007-01-10 15:10:53 UTC (rev 4028)
@@ -3,6 +3,10 @@
(This summarizes all changes to all files under Src, including Src\Languages.)
2007-01-10 Takashi
+ BUG: [ 1631613 ] WinMerge crashes when editing code files
+ Src/editlib: ccrystaleditview.cpp
+
+2007-01-10 Takashi
BUG: [ 1630630 ] Unexpected selection of text after changing pane
Src: MergeEditView.cpp
Modified: branches/R2_6/Src/editlib/ccrystaleditview.cpp
===================================================================
--- branches/R2_6/Src/editlib/ccrystaleditview.cpp 2007-01-10 15:10:02 UTC (rev 4027)
+++ branches/R2_6/Src/editlib/ccrystaleditview.cpp 2007-01-10 15:10:53 UTC (rev 4028)
@@ -1641,7 +1641,7 @@
{
int nTabSize = GetTabSize ();
int nChars = nTabSize - nPos % nTabSize;
- pszInsertStr = (TCHAR *) _alloca (sizeof (TCHAR) * (nPos + nChars));
+ pszInsertStr = (TCHAR *) _alloca (sizeof (TCHAR) * (nPos + nChars + 1));
_tcsncpy (pszInsertStr, pszLineChars, nPos);
while (nChars--)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-11 19:51:43
|
Revision: 4035
http://svn.sourceforge.net/winmerge/?rev=4035&view=rev
Author: kimmov
Date: 2007-01-11 11:51:37 -0800 (Thu, 11 Jan 2007)
Log Message:
-----------
BUG: [ 1616838 ] Directory filter broken?
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/FileFilterMgr.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-01-11 13:57:37 UTC (rev 4034)
+++ branches/R2_6/Src/Changes.txt 2007-01-11 19:51:37 UTC (rev 4035)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-11 Kimmo
+ BUG: [ 1616838 ] Directory filter broken?
+ Src: FileFilterMgr.cpp
+
2007-01-11 Gal
BUG: [ 1602313 ] WinMerge stays in tasklist after closing
Src: MainFrm.cpp MainFrm.h
Modified: branches/R2_6/Src/FileFilterMgr.cpp
===================================================================
--- branches/R2_6/Src/FileFilterMgr.cpp 2007-01-11 13:57:37 UTC (rev 4034)
+++ branches/R2_6/Src/FileFilterMgr.cpp 2007-01-11 19:51:37 UTC (rev 4035)
@@ -27,8 +27,6 @@
static char THIS_FILE[] = __FILE__;
#endif
-static void FileFilterToUppercase(CString & filterStr);
-
/**
* @brief Deletes items from filter list.
*
@@ -152,50 +150,17 @@
}
/**
- * @brief Convert filter string to uppercase.
- * This function converts given filter string to upper case. The function
- * does not convert regexp control chars (e.g. '\d') or chars after comment
- * separator.
- * @param [in,out] filterStr Filter string to convert.
- */
-static void FileFilterToUppercase(CString & filterStr)
-{
- int ind = 0;
- const int len = filterStr.GetLength();
- BOOL bContinue = TRUE;
-
- while (ind < len && bContinue)
- {
- // Check if it is comment separator "[space]##"
- if (ind > 2 && _istspace(ind - 2) && filterStr[ind - 1] == '#' &&
- filterStr[ind] == '#')
- {
- bContinue = FALSE;
- }
-
- // We make all other chars in regexp uppercase, except escaped
- // regexp control chars, e.g. "\d".
- TCHAR ch = filterStr[ind];
- BOOL bAlpha = _istalpha(ch);
- if (bContinue && bAlpha && (ind == 0 || filterStr[ind - 1] != '\\'))
- {
- ch = _totupper(ch);
- filterStr.SetAt(ind, ch);
- }
- ++ind;
- }
-}
-
-/**
* @brief Add a single pattern (if nonempty & valid) to a pattern list.
*
* @param [in] filterList List where pattern is added.
* @param [in] str Temporary variable (ie, it may be altered)
+ * @note Regular expressions are converted to lower case. We do it so that
+ * we don't break them by uppercasing escaped control chars (e.g "\d").
*/
static void AddFilterPattern(FileFilterList & filterList, CString & str)
{
LPCTSTR commentLeader = _T("##"); // Starts comment
- FileFilterToUppercase(str);
+ str.MakeLower();
str.TrimLeft();
// Ignore lines beginning with '##'
@@ -325,7 +290,7 @@
/**
* @brief Test given string against given regexp list.
- *
+ * We store regular expression as lower case.
* @param [in] filterList List of regexps to test against.
* @param [in] szTest String to test against regexps.
* @return TRUE if string passes
@@ -334,7 +299,7 @@
BOOL TestAgainstRegList(const FileFilterList & filterList, LPCTSTR szTest)
{
CString str = szTest;
- str.MakeUpper();
+ str.MakeLower(); // Make lower case as regexp was convereted also.
for (POSITION pos = filterList.GetHeadPosition(); pos; )
{
const FileFilterElement & elem = filterList.GetNext(pos);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2007-01-12 09:11:10
|
Revision: 4036
http://svn.sourceforge.net/winmerge/?rev=4036&view=rev
Author: galh
Date: 2007-01-12 01:11:08 -0800 (Fri, 12 Jan 2007)
Log Message:
-----------
PATCH: [ 1633194 ] Add editor tab setting to configuration log
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/ConfigLog.cpp
branches/R2_6/Src/ConfigLog.h
branches/R2_6/Src/MainFrm.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-01-11 19:51:37 UTC (rev 4035)
+++ branches/R2_6/Src/Changes.txt 2007-01-12 09:11:08 UTC (rev 4036)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-12 Gal
+ PATCH: [ 1633194 ] Add editor tab setting to configuration log
+ Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
+
2007-01-11 Kimmo
BUG: [ 1616838 ] Directory filter broken?
Src: FileFilterMgr.cpp
Modified: branches/R2_6/Src/ConfigLog.cpp
===================================================================
--- branches/R2_6/Src/ConfigLog.cpp 2007-01-11 19:51:37 UTC (rev 4035)
+++ branches/R2_6/Src/ConfigLog.cpp 2007-01-12 09:11:08 UTC (rev 4036)
@@ -455,6 +455,8 @@
WriteItemYesNo(2, _T("Show linenumbers"), &m_miscSettings.bShowLinenumbers);
WriteItemYesNo(2, _T("Wrap lines"), &m_miscSettings.bWrapLines);
WriteItemYesNo(2, _T("Syntax Highlight"), &m_miscSettings.bSyntaxHighlight);
+ WriteItem(m_file, 2, _T("Tab size"), m_miscSettings.nTabSize);
+ WriteItemYesNoInverted(2, _T("Insert tabs"), &m_miscSettings.bInsertTabs);
// Font settings
FileWriteString(_T("\n Font:\n"));
Modified: branches/R2_6/Src/ConfigLog.h
===================================================================
--- branches/R2_6/Src/ConfigLog.h 2007-01-11 19:51:37 UTC (rev 4035)
+++ branches/R2_6/Src/ConfigLog.h 2007-01-12 09:11:08 UTC (rev 4036)
@@ -65,6 +65,8 @@
BOOL bWrapLines;
BOOL bMergeMode;
BOOL bSyntaxHighlight;
+ BOOL bInsertTabs;
+ INT nTabSize;
};
/**
Modified: branches/R2_6/Src/MainFrm.cpp
===================================================================
--- branches/R2_6/Src/MainFrm.cpp 2007-01-11 19:51:37 UTC (rev 4035)
+++ branches/R2_6/Src/MainFrm.cpp 2007-01-12 09:11:08 UTC (rev 4036)
@@ -2384,6 +2384,8 @@
LoadConfigBoolSetting(&configLog.m_miscSettings.bWrapLines, options, OPT_WORDWRAP, cfgdir);
LoadConfigBoolSetting(&configLog.m_miscSettings.bMergeMode, options, OPT_MERGE_MODE, cfgdir);
LoadConfigBoolSetting(&configLog.m_miscSettings.bSyntaxHighlight, options, OPT_SYNTAX_HIGHLIGHT, cfgdir);
+ LoadConfigIntSetting(&configLog.m_miscSettings.bInsertTabs, options, OPT_TAB_TYPE, cfgdir);
+ LoadConfigIntSetting(&configLog.m_miscSettings.nTabSize, options, OPT_TAB_SIZE, cfgdir);
LoadConfigIntSetting(&configLog.m_cpSettings.nDefaultMode, options, OPT_CP_DEFAULT_MODE, cfgdir);
LoadConfigIntSetting(&configLog.m_cpSettings.nDefaultCustomValue, options, OPT_CP_DEFAULT_CUSTOM, cfgdir);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2007-01-12 09:18:51
|
Revision: 4037
http://svn.sourceforge.net/winmerge/?rev=4037&view=rev
Author: galh
Date: 2007-01-12 01:18:47 -0800 (Fri, 12 Jan 2007)
Log Message:
-----------
BUG: [ 1597939 ] Rename Edits Wrong Field in Folder Compare List
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/DirView.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-01-12 09:11:08 UTC (rev 4036)
+++ branches/R2_6/Src/Changes.txt 2007-01-12 09:18:47 UTC (rev 4037)
@@ -3,6 +3,10 @@
(This summarizes all changes to all files under Src, including Src\Languages.)
2007-01-12 Gal
+ BUG: [ 1597939 ] Rename Edits Wrong Field in Folder Compare List
+ Src: DirView.cpp
+
+2007-01-12 Gal
PATCH: [ 1633194 ] Add editor tab setting to configuration log
Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
Modified: branches/R2_6/Src/DirView.cpp
===================================================================
--- branches/R2_6/Src/DirView.cpp 2007-01-12 09:11:08 UTC (rev 4036)
+++ branches/R2_6/Src/DirView.cpp 2007-01-12 09:18:47 UTC (rev 4037)
@@ -2804,18 +2804,22 @@
*
* Disable label edit if initiated from a user double-click.
*/
-afx_msg void CDirView::OnBeginLabelEdit(NMHDR* /*pNMHDR*/, LRESULT* pResult)
+afx_msg void CDirView::OnBeginLabelEdit(NMHDR* pNMHDR, LRESULT* pResult)
{
*pResult = IsItemSelectedSpecial();
// If label edit is allowed.
if (FALSE == *pResult)
{
- CEdit *pEdit = m_pList->GetEditControl();
- ASSERT(NULL != pEdit);
+ const NMLVDISPINFO *pdi = (NMLVDISPINFO*)pNMHDR;
+ ASSERT(pdi != NULL);
- CString sText;
- pEdit->GetWindowText(sText);
+ // Locate the edit box on the right column in case the user changed the
+ // column order.
+ const int nColPos = ColLogToPhys(0);
+
+ // Get text from the "File Name" column.
+ CString sText = m_pList->GetItemText(pdi->item.iItem, nColPos);
ASSERT(!sText.IsEmpty());
// Keep only left file name (separated by '|'). This form occurs
@@ -2824,9 +2828,13 @@
if (-1 != nPos)
{
sText = sText.Left(nPos);
- pEdit->SetWindowText(sText);
}
+ // Set the edit control with the updated text.
+ CEdit *pEdit = m_pList->GetEditControl();
+ ASSERT(NULL != pEdit);
+ pEdit->SetWindowText(sText);
+
m_bUserCancelEdit = FALSE;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2007-01-12 22:54:08
|
Revision: 4038
http://svn.sourceforge.net/winmerge/?rev=4038&view=rev
Author: sdottaka
Date: 2007-01-12 14:54:06 -0800 (Fri, 12 Jan 2007)
Log Message:
-----------
BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly(2)
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/DirActions.cpp
branches/R2_6/Src/FileActionScript.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-01-12 09:18:47 UTC (rev 4037)
+++ branches/R2_6/Src/Changes.txt 2007-01-12 22:54:06 UTC (rev 4038)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-12 Takashi
+ BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly(2)
+ Src: FileActionScript.cpp DirActions.cpp
+
2007-01-12 Gal
BUG: [ 1597939 ] Rename Edits Wrong Field in Folder Compare List
Src: DirView.cpp
Modified: branches/R2_6/Src/DirActions.cpp
===================================================================
--- branches/R2_6/Src/DirActions.cpp 2007-01-12 09:18:47 UTC (rev 4037)
+++ branches/R2_6/Src/DirActions.cpp 2007-01-12 22:54:06 UTC (rev 4038)
@@ -300,7 +300,6 @@
*/
void CDirView::DoCopyLeftTo()
{
- CShellFileOp fileOp;
CString destPath;
CString startPath;
CString msg;
@@ -311,10 +310,9 @@
WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_COPYFILES));
- fileOp.SetOperationFlags(FO_COPY, this, FOF_NOCONFIRMMKDIR);
- if (!GetDocument()->GetRecursive())
- fileOp.AddDestFile(destPath);
-
+ FileActionScript actionScript;
+ const FileAction::ACT_TYPE actType = FileAction::ACT_COPY;
+ int selCount = 0;
int sel = -1;
CString slFile, srFile;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
@@ -323,28 +321,29 @@
if (di.diffcode != 0 && IsItemCopyableToOnLeft(di))
{
+ FileActionItem act;
+ CString sFullDest(destPath);
+ sFullDest += _T("\\");
if (GetDocument()->GetRecursive())
{
- CString sFullDest(destPath);
- sFullDest += _T("\\");
if (!di.sLeftSubdir.IsEmpty())
sFullDest += di.sLeftSubdir + _T("\\");
- if (di.isDirectory())
- paths_CreateIfNeeded(sFullDest);
- else
- sFullDest += di.sLeftFilename;
- fileOp.AddDestFile(sFullDest);
}
+ sFullDest += di.sLeftFilename;
+ act.dest = sFullDest;
+
GetItemFileNames(sel, slFile, srFile);
- fileOp.AddSourceFile(slFile);
+ act.src = slFile;
+ act.dirflag = di.isDirectory();
+ act.context = sel;
+ act.atype = actType;
+ act.UIResult = FileActionItem::UI_DESYNC;
+ actionScript.AddActionItem(act);
+ ++selCount;
}
}
-
- BOOL bSuccess = FALSE;
- BOOL bAPICalled = FALSE;
- BOOL bAborted = FALSE;
- int nAPIReturn = 0;
- bSuccess = fileOp.Go(&bAPICalled, &nAPIReturn, &bAborted);
+ // Now we prompt, and execute actions
+ ConfirmAndPerformActions(actionScript, selCount);
}
/**
@@ -356,7 +355,6 @@
*/
void CDirView::DoCopyRightTo()
{
- CShellFileOp fileOp;
CString destPath;
CString startPath;
CString msg;
@@ -367,10 +365,9 @@
WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_COPYFILES));
- fileOp.SetOperationFlags(FO_COPY, this, FOF_NOCONFIRMMKDIR);
- if (!GetDocument()->GetRecursive())
- fileOp.AddDestFile(destPath);
-
+ FileActionScript actionScript;
+ const FileAction::ACT_TYPE actType = FileAction::ACT_COPY;
+ int selCount = 0;
int sel = -1;
CString slFile, srFile;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
@@ -379,28 +376,29 @@
if (di.diffcode != 0 && IsItemCopyableToOnRight(di))
{
+ FileActionItem act;
+ CString sFullDest(destPath);
+ sFullDest += _T("\\");
if (GetDocument()->GetRecursive())
{
- CString sFullDest(destPath);
- sFullDest += _T("\\");
if (!di.sRightSubdir.IsEmpty())
sFullDest += di.sRightSubdir + _T("\\");
- if (di.isDirectory())
- paths_CreateIfNeeded(sFullDest);
- else
- sFullDest += di.sRightFilename;
- fileOp.AddDestFile(sFullDest);
}
+ sFullDest += di.sRightFilename;
+ act.dest = sFullDest;
+
GetItemFileNames(sel, slFile, srFile);
- fileOp.AddSourceFile(srFile);
+ act.src = srFile;
+ act.dirflag = di.isDirectory();
+ act.context = sel;
+ act.atype = actType;
+ act.UIResult = FileActionItem::UI_DESYNC;
+ actionScript.AddActionItem(act);
+ ++selCount;
}
}
-
- BOOL bSuccess = FALSE;
- BOOL bAPICalled = FALSE;
- BOOL bAborted = FALSE;
- int nAPIReturn = 0;
- bSuccess = fileOp.Go( &bAPICalled, &nAPIReturn, &bAborted );
+ // Now we prompt, and execute actions
+ ConfirmAndPerformActions(actionScript, selCount);
}
/**
@@ -441,10 +439,7 @@
if (!di.sLeftSubdir.IsEmpty())
sFullDest += di.sLeftSubdir + _T("\\");
}
- if (di.isDirectory())
- paths_CreateIfNeeded(sFullDest);
- else
- sFullDest += di.sLeftFilename;
+ sFullDest += di.sLeftFilename;
act.dest = sFullDest;
GetItemFileNames(sel, slFile, srFile);
@@ -499,10 +494,7 @@
if (!di.sRightSubdir.IsEmpty())
sFullDest += di.sRightSubdir + _T("\\");
}
- if (di.isDirectory())
- paths_CreateIfNeeded(sFullDest);
- else
- sFullDest += di.sRightFilename;
+ sFullDest += di.sRightFilename;
act.dest = sFullDest;
GetItemFileNames(sel, slFile, srFile);
Modified: branches/R2_6/Src/FileActionScript.cpp
===================================================================
--- branches/R2_6/Src/FileActionScript.cpp 2007-01-12 09:18:47 UTC (rev 4037)
+++ branches/R2_6/Src/FileActionScript.cpp 2007-01-12 22:54:06 UTC (rev 4038)
@@ -27,6 +27,7 @@
#include "MainFrm.h"
#include "FileActionScript.h"
#include "CShellFileOp.h"
+#include "paths.h"
/**
* @brief Standard constructor.
@@ -171,7 +172,7 @@
// Move operations next
operation = FO_MOVE;
- operFlags = 0;
+ operFlags = FOF_MULTIDESTFILES;
if (m_bUseRecycleBin)
operFlags |= FOF_ALLOWUNDO;
@@ -230,8 +231,18 @@
__try
{
if (m_bHasCopyOperations)
+ {
+ POSITION pos = m_actions.GetHeadPosition();
+ while (pos != NULL)
+ {
+ const FileActionItem &act = m_actions.GetNext(pos);
+ if (act.dirflag)
+ paths_CreateIfNeeded(act.dest);
+ }
+
bFileOpSucceed = m_pCopyOperations->Go(&bOpStarted,
&apiRetVal, &bUserCancelled);
+ }
if (m_bHasMoveOperations)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-15 15:27:04
|
Revision: 4050
http://svn.sourceforge.net/winmerge/?rev=4050&view=rev
Author: kimmov
Date: 2007-01-15 07:26:53 -0800 (Mon, 15 Jan 2007)
Log Message:
-----------
Revert regexp uppercasing patches as they seem to cause different problems
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/FileFilterMgr.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-01-14 21:59:20 UTC (rev 4049)
+++ branches/R2_6/Src/Changes.txt 2007-01-15 15:26:53 UTC (rev 4050)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-15 Kimmo
+ Revert regexp uppercasing patches as they seem to cause different problems
+ Backs out patches: bug #1616838 Directory filter broken?
+ patch #1607343 Fix filefilter regexp uppercasing for 2.6 branch
+
2007-01-14 Kimmo
Update manual URL point to 2.6 version manual in readme.txt
Docs/Users/ReadMe.txt
Modified: branches/R2_6/Src/FileFilterMgr.cpp
===================================================================
--- branches/R2_6/Src/FileFilterMgr.cpp 2007-01-14 21:59:20 UTC (rev 4049)
+++ branches/R2_6/Src/FileFilterMgr.cpp 2007-01-15 15:26:53 UTC (rev 4050)
@@ -154,13 +154,11 @@
*
* @param [in] filterList List where pattern is added.
* @param [in] str Temporary variable (ie, it may be altered)
- * @note Regular expressions are converted to lower case. We do it so that
- * we don't break them by uppercasing escaped control chars (e.g "\d").
*/
static void AddFilterPattern(FileFilterList & filterList, CString & str)
{
LPCTSTR commentLeader = _T("##"); // Starts comment
- str.MakeLower();
+ str.MakeUpper();
str.TrimLeft();
// Ignore lines beginning with '##'
@@ -290,7 +288,7 @@
/**
* @brief Test given string against given regexp list.
- * We store regular expression as lower case.
+ *
* @param [in] filterList List of regexps to test against.
* @param [in] szTest String to test against regexps.
* @return TRUE if string passes
@@ -299,7 +297,7 @@
BOOL TestAgainstRegList(const FileFilterList & filterList, LPCTSTR szTest)
{
CString str = szTest;
- str.MakeLower(); // Make lower case as regexp was convereted also.
+ str.MakeUpper();
for (POSITION pos = filterList.GetHeadPosition(); pos; )
{
const FileFilterElement & elem = filterList.GetNext(pos);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-02-10 18:38:13
|
Revision: 4102
http://svn.sourceforge.net/winmerge/?rev=4102&view=rev
Author: kimmov
Date: 2007-02-10 10:38:06 -0800 (Sat, 10 Feb 2007)
Log Message:
-----------
PATCH: [ 1650831 ] Polish translation update for WinMerge 2.6.4
- Submitted by dr_prozac
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Languages/Polish/MergePolish.rc
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-02-08 16:43:17 UTC (rev 4101)
+++ branches/R2_6/Src/Changes.txt 2007-02-10 18:38:06 UTC (rev 4102)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-02-10 Kimmo
+ PATCH: [ 1650831 ] Polish translation update for WinMerge 2.6.4
+ Submitted by dr_prozac
+ Src/Languages/Polish: MergePolish.rc
+
2007-01-30 Kimmo
PATCH: [ 1639493 ] Updated Bulgarian language files
Submitted by tigertron
Modified: branches/R2_6/Src/Languages/Polish/MergePolish.rc
===================================================================
--- branches/R2_6/Src/Languages/Polish/MergePolish.rc 2007-02-08 16:43:17 UTC (rev 4101)
+++ branches/R2_6/Src/Languages/Polish/MergePolish.rc 2007-02-10 18:38:06 UTC (rev 4102)
@@ -178,7 +178,7 @@
END
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
- MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "Za\xB3a&duj ustawienia...", ID_DEBUG_LOADCONFIG
END
POPUP "&Okno"
BEGIN
@@ -229,7 +229,7 @@
MENUITEM "W\xB3&a\x9Cciwo\x9Cci...", ID_OPTIONS
MENUITEM SEPARATOR
MENUITEM "O&d\x9Cwie\xBF\tF5", ID_REFRESH
- MENUITEM "&Refresh Selected\tCtrl+F5", ID_DIR_RESCAN
+ MENUITEM "&Od\x9Cwie\xBF zaznaczone\tCtrl+F5", ID_DIR_RESCAN
END
POPUP "&Widok"
BEGIN
@@ -285,7 +285,7 @@
END
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
- MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "Za\xB3a&duj ustawienia...", ID_DEBUG_LOADCONFIG
END
POPUP "&Okno"
BEGIN
@@ -340,7 +340,7 @@
MENUITEM "Lewa tylko &odczyt", ID_FILE_LEFT_READONLY
MENUITEM "Prawa t&ylko odczyt", ID_FILE_RIGHT_READONLY
MENUITEM SEPARATOR
- POPUP "&Convert Line Endings to"
+ POPUP "&Konwertuj ko\xF1ce linii do"
BEGIN
MENUITEM "&DOS (CRLF)", ID_EOL_TO_DOS
MENUITEM "&UNIX (LF)", ID_EOL_TO_UNIX
@@ -447,7 +447,7 @@
END
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
- MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "Za\xB3a&duj ustawienia...", ID_DEBUG_LOADCONFIG
END
POPUP "&Okno"
BEGIN
@@ -782,7 +782,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,7,37,135,10
CONTROL "Wyra\xBFenie ®ularne",IDC_EDIT_REGEXP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,47,135,10
- CONTROL "D&on't wrap end of file",IDC_FINDDLG_DONTWRAP,"Button",
+ CONTROL "Nie zawijaj k&o\xF1ca linii",IDC_FINDDLG_DONTWRAP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,57,135,10
GROUPBOX "Kierunek",IDC_STATIC,148,23,70,36,WS_GROUP
CONTROL "Do &g\xF3ry",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON |
@@ -952,12 +952,12 @@
CONTROL "Ignoruj r\xF3\xBFnice czasu mniejsze ni\xBF 3 sekundy",
IDC_IGNORE_SMALLTIMEDIFF,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,17,222,10
- GROUPBOX "Integration",IDC_STATIC,7,30,218,46
+ GROUPBOX "Integracja",IDC_STATIC,7,30,218,46
CONTROL "&Dodaj do menu kontekstowego eksploratora",IDC_EXPLORER_CONTEXT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,41,200,10
CONTROL "W\xB3\xB9cz menu &zaawansowane",IDC_EXPLORER_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,51,200,10
- CONTROL "In&clude subfolders by default",IDC_EXPLORER_SUBFOLDERS,
+ CONTROL "Domy\x9C&lnie uwzgl\xEAdnij podkatalogi",IDC_EXPLORER_SUBFOLDERS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,61,200,10
LTEXT "Zewn\xEAtrzny &edytor:",IDC_STATIC,7,83,222,8
EDITTEXT IDC_EXT_EDITOR_PATH,7,93,167,14,ES_AUTOHSCROLL
@@ -1136,8 +1136,8 @@
WS_VSCROLL | WS_TABSTOP
CONTROL "&Zatrzymaj po pierwszej r\xF3\xBFnicy",IDC_COMPARE_STOPFIRST,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10
- GROUPBOX "Comments",IDC_STATIC,7,134,221,32
- CONTROL "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button",
+ GROUPBOX "Komentarze",IDC_STATIC,7,134,221,32
+ CONTROL "Komentarze filtra",IDC_FILTERCOMMENTS_CHECK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
PUSHBUTTON "Domy\x9Clne",IDC_COMPARE_DEFAULTS,7,179,50,14
END
@@ -1189,7 +1189,7 @@
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER |
WS_BORDER | WS_TABSTOP,7,7,342,100
PUSHBUTTON "Test",IDC_FILTERFILE_TEST_BTN,7,114,50,14
- PUSHBUTTON "Install...",IDC_FILTERFILE_INSTALL,137,114,50,14
+ PUSHBUTTON "Instaluj...",IDC_FILTERFILE_INSTALL,137,114,50,14
PUSHBUTTON "Nowy...",IDC_FILTERFILE_NEWBTN,192,114,50,14
PUSHBUTTON "Edycja...",IDC_FILTERFILE_EDITBTN,246,114,50,14
PUSHBUTTON "Usu\xF1...",IDC_FILTERFILE_DELETEBTN,300,114,50,14
@@ -1235,7 +1235,7 @@
BS_AUTORADIOBUTTON | WS_GROUP,13,42,210,10
CONTROL "Wed\xB3ug interfejsu WinMerge",IDC_CP_UI,"Button",
BS_AUTORADIOBUTTON,13,55,210,10
- CONTROL "Strona kodowa u\xBFytkownika:",IDC_CP_CUSTOM,"Button",
+ CONTROL "Str. kodowa u\xBFytkownika:",IDC_CP_CUSTOM,"Button",
BS_AUTORADIOBUTTON,13,68,98,10
EDITTEXT IDC_CUSTOM_CP_NUMBER,123,67,56,13,ES_AUTOHSCROLL
END
@@ -1383,7 +1383,7 @@
LTEXT "&Styl:",IDC_STATIC,7,37,35,8
COMBOBOX IDC_REPORT_STYLECOMBO,46,35,158,70,CBS_DROPDOWNLIST |
CBS_SORT | WS_VSCROLL | WS_TABSTOP
- CONTROL "&Copy to Clipboard",IDC_REPORT_COPYCLIPBOARD,"Button",
+ CONTROL "&Kopiuj do schowka",IDC_REPORT_COPYCLIPBOARD,"Button",
BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,7,53,133,10
DEFPUSHBUTTON "OK",IDOK,157,60,50,14
PUSHBUTTON "Anuluj",IDCANCEL,211,60,50,14
@@ -1479,7 +1479,7 @@
LTEXT "(Dzia\xB3anie)",IDC_LEFT_FILES_LABEL,70,18,93,8
CONTROL "&Prawa",IDC_AFFECTS_RIGHT_BTN,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,12,29,54,8
- LTEXT "(Affects)",IDC_RIGHT_FILES_LABEL,70,29,93,8
+ LTEXT "(Dotyczy)",IDC_RIGHT_FILES_LABEL,70,29,93,8
GROUPBOX "Wybierz stron\xEA kodow\xB9 dla",IDC_LOADING_GROUP,5,48,166,63
LTEXT "&\xA3adowanie pliku:",IDC_LOAD_FILES_LABEL,12,64,72,10
EDITTEXT IDC_LOAD_CODEPAGE_TEXTBOX,86,63,45,12,ES_AUTOHSCROLL
@@ -1518,7 +1518,7 @@
CAPTION "Okno"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Use customized text colors",
+ CONTROL "&U\xBFyj w\xB3asnych kolor\xF3w tekstu",
IDC_DEFAULT_STANDARD_COLORS,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,25,14,161,10
GROUPBOX "Kolory tekstu u\xBFytkownika",IDC_CUSTOM_COLORS_GROUP,27,33,159,
@@ -1554,11 +1554,11 @@
RTEXT "&Lewa:",IDC_STATIC,7,11,40,8
EDITTEXT IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL
PUSHBUTTON "Przegl\xB9daj...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
- CONTROL "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
+ CONTROL "Ty&lko do odczytu",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
RTEXT "&Prawa:",IDC_STATIC,7,42,40,8
EDITTEXT IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL
PUSHBUTTON "Przegl\xB9daj...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
- CONTROL "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
+ CONTROL "Ty&lko do odczytu",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
RTEXT "&Filtr:",IDC_STATIC,7,74,40,8
EDITTEXT IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL
PUSHBUTTON "Wybierz...",IDC_PROJ_FILTER_SELECT,265,72,50,14
@@ -1591,15 +1591,15 @@
BEGIN
BLOCK "041504e2"
BEGIN
- VALUE "Komentarze", "T\xB3umaczenie: Pawe\xB3 Wawrzyszko\0"
+ VALUE "Komentarze", "T\xB3umaczenie: Mateo Gola\0"
VALUE "FileDescription", "Aplikacja WinMerge\0"
VALUE "FileVersion", "2.0.0.1\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
- VALUE "ProductVersion", "2.0.0\0"
+ VALUE "ProductVersion", "2.6.4\0"
END
END
BLOCK "VarFileInfo"
@@ -1748,8 +1748,8 @@
IDS_UNK_ERROR_READING_PROJECT "Nieznany b\xB3\xB9d podczas otwierania projektu"
IDS_UNK_ERROR_SAVING_PROJECT "Nieznany b\xB3\xB9d podczas zapisu projektu"
IDS_PROJFILEDLG_CAPTION "Plik projektu"
- IDS_PROJFILE_LOAD_SUCCESS "Project file successfully loaded."
- IDS_PROJFILE_SAVE_SUCCESS "Project file successfully saved."
+ IDS_PROJFILE_LOAD_SUCCESS "Plik projektu za\xB3adowano pomy\x9Clnie."
+ IDS_PROJFILE_SAVE_SUCCESS "Plik projektu zapisano pomy\x9Clnie."
ID_FILE_SAVEPROJECT "Zapisz aktualne \x9Ccie\xBFki i opcje do pliku projektu\nZapisz plik projektu"
END
@@ -1952,7 +1952,7 @@
IDS_CMDLINE_LEFTPATH "lewa\x9Ccie\xBFka to katalog lub plik, kt\xF3ry ma by\xE6 otwarty w lewym panelu"
IDS_CMDLINE_RIGHTPATH "prawa\x9Ccie\xBFka to katalog lub plik, kt\xF3ry ma by\xE6 otwarty w prawym panelu"
IDS_CMDLINE_OUTPUTPATH "\x9Ccie\xBFkawyj\x9Cciowa to opcjonalny ktalaog wyj\x9Cciowy, gdzie maj\xB9 by\xE6 zachowane scalone pliki"
- IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference."
+ IDS_CMDLINE_SEEMANUAL "Pe\xB3ny opis linii komend w podr\xEAczniku."
END
// VARIOUS OPTIONS
@@ -1963,7 +1963,7 @@
IDS_DIFF_OPEN_NO_SET_PROPS "Dokonano modyfikacji w pliku bie\xBF\xB9cej sesji por\xF3wnywania. Niekt\xF3re ustawienia nie zostan\xB9 zastosowane przed ponownym uruchomieniem powr\xF3wnywania."
IDS_FONT_CHANGE "Wybrana czcionka nie zostanie zastosowana do widocznych okien z r\xF3\xBFnicami."
IDS_OPTIONS_INVALID_TABSIZE
- "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
+ "Warto\x9C\xE6 w zak\xB3adce wielko\x9Cci nie mo\xBFe by\xE6 zaakceptowana przez WinMerge.\n\nProsz\xEA u\xBFy\xE6 warto\x9Cci 1 - %1."
END
// BROWSE FILE
@@ -1992,7 +1992,7 @@
IDS_COMPMETHOD_QUICK_CONTENTS "Skr\xF3cona zawarto\x9C\xE6"
IDS_COMPMETHOD_MODDATE "Data modyfikacji"
IDS_COMPMETHOD_DATESIZE "Data modyfikacji i wielko\x9C\xE6"
- IDS_COMPMETHOD_SIZE "Size"
+ IDS_COMPMETHOD_SIZE "Wielko\x9C\xE6"
END
// FILTER OPTIONS
@@ -2006,18 +2006,18 @@
IDS_FILEFILTER_SAVENEW "Wybierz nazw\xEA dla nowego filtra"
IDS_FILEFILTER_FILEMASK "Filtry plik\xF3w(*.flt)|*.flt|Wszystkie filtry (*.*)|*.*||"
IDS_FILEFILTER_TMPL_MISSING
- "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder."
+ "Nie mo\xBFna odnale\x9F\xE6 pliku szablonu filtra!\n\nProsz\xEA skopiowa\xE6 plik %1 do folderu WinMerge/Filters."
IDS_FILEFILTER_TMPL_COPY
- "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable."
+ "Nie mo\xBFna skopiowa\xE6 pliku szablonu filtra do folderu:\n%1\n\nUpewnij si\xEA, \xBFe folder taki istnieje i jest zapisywalny."
IDS_FILEFILTER_NO_USERFOLDER
- "User's filter file folder is not defined!\n\nPlease select filter folder in options/System."
+ "Folder plik\xF3w filtr\xF3w u\xBFytkownika nie jest zdefiniowany!\n\nProsz\xEA wybra\xE6 folder filtr\xF3w w opcje/System."
IDS_FILEFILTER_DELETE_FAIL
- "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?"
- IDS_FILEFILTER_INSTALL "Locate filter file to install"
+ "Nie mo\xBFna usun\xB9\xE6 pliku filtra:\n%1\n\nBy\xE6 mo\xBFe plik ten jest tylko do odczytu?"
+ IDS_FILEFILTER_INSTALL "Lokalizuj plik fitra do instalacji"
IDS_FILEFILTER_INSTALLFAIL
- "Installing filter file failed.\n\nCould not copy new filter file to filter folder."
+ "Instalowanie pliku filtra nie powiod\xB3o si\xEA.\n\nNie mo\xBFna skopiowa\xE6 pliku do foldera filtr\xF3w."
IDS_FILEFILTER_OVERWRITE
- "Filter file already exists. Overwrite existing filter?"
+ "Plik filtra ju\xBF istnieje. Czy nadpisa\xE6 istniej\xB9cy plik?"
END
// VERSION CONTROL OPTIONS
@@ -2266,8 +2266,8 @@
BEGIN
IDS_COLHDR_LENCODING "Lewe kodowanie"
IDS_COLHDR_RENCODING "Prawe kodowanie"
- IDS_COLHDR_NIDIFFS "Ignored Diff."
- IDS_COLHDR_NSDIFFS "Differences"
+ IDS_COLHDR_NIDIFFS "Ignorowane r\xF3\xBFn."
+ IDS_COLHDR_NSDIFFS "R\xF3\xBFnice"
IDS_COLHDR_BINARY "Binarne"
END
@@ -2275,7 +2275,7 @@
STRINGTABLE
BEGIN
IDS_CANT_COMPARE_FILES "Nie mo\xBFna por\xF3wna\xE6 plik\xF3w"
- IDS_ABORTED_ITEM "Item aborted"
+ IDS_ABORTED_ITEM "Anulowany"
IDS_FILE_SKIPPED "Plik pomini\xEAty"
IDS_DIR_SKIPPED "Katalog pomini\xEAty"
IDS_ONLY_IN_FMT "Tylko w %1"
@@ -2331,8 +2331,8 @@
BEGIN
IDS_COLDESC_LENCODING "Kodowanie lewej strony."
IDS_COLDESC_RENCODING "Kodowanie prawej strony."
- IDS_COLDESC_NIDIFFS "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
- IDS_COLDESC_NSDIFFS "Number of differences in file. This number does not include ignored differences."
+ IDS_COLDESC_NIDIFFS "Liczba r\xF3\xBFnic zignorowanych w pliku. R\xF3\xBFnice te zosta\xB3y zignorowane przez WinMerge i nie mog\xB9 zosta\xE6 po\xB3\xB9czone."
+ IDS_COLDESC_NSDIFFS "Liczba r\xF3\xBFnic w pliku. Liczba ta nie zawiera zignorowanych r\xF3\xBFnic."
IDS_COLDESC_BINARY "Pokazuje gwiazdk\xEA (*) je\x9Cli plik binarny."
END
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-02-27 16:48:17
|
Revision: 4134
http://svn.sourceforge.net/winmerge/?rev=4134&view=rev
Author: kimmov
Date: 2007-02-27 08:36:01 -0800 (Tue, 27 Feb 2007)
Log Message:
-----------
PATCH: [ 1664689 ] French translation
- Submitted by Jean-F Jolin
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Languages/French/MergeFrench.rc
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-02-26 17:15:53 UTC (rev 4133)
+++ branches/R2_6/Src/Changes.txt 2007-02-27 16:36:01 UTC (rev 4134)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-02-27 Kimmo
+ PATCH: [ 1664689 ] French translation
+ Submitted by Jean-F Jolin
+ Src/Languages/French: MergeFrench.rc
+
2007-02-10 Kimmo
PATCH: [ 1650831 ] Polish translation update for WinMerge 2.6.4
Submitted by dr_prozac
Modified: branches/R2_6/Src/Languages/French/MergeFrench.rc
===================================================================
--- branches/R2_6/Src/Languages/French/MergeFrench.rc 2007-02-26 17:15:53 UTC (rev 4133)
+++ branches/R2_6/Src/Languages/French/MergeFrench.rc 2007-02-27 16:36:01 UTC (rev 4134)
@@ -101,7 +101,7 @@
MENUITEM "Copier vers la &droite", ID_L2R
MENUITEM "Copier vers la &gauche", ID_R2L
MENUITEM SEPARATOR
- MENUITEM "&Select Line Difference", ID_SELECTLINEDIFF
+ MENUITEM "&S\xE9lectionner la distinction", ID_SELECTLINEDIFF
MENUITEM SEPARATOR
MENUITEM "Ann&uler", ID_EDIT_UNDO
MENUITEM "&R\xE9tablir", ID_EDIT_REDO
@@ -125,12 +125,12 @@
BEGIN
POPUP "_POPUP_"
BEGIN
- MENUITEM "C&opy to Right", ID_L2R
- MENUITEM "Cop&y to Left", ID_R2L
+ MENUITEM "Copier vers la &droite", ID_L2R
+ MENUITEM "Copier vers la &gauche", ID_R2L
MENUITEM SEPARATOR
- MENUITEM "Cu&t", ID_EDIT_CUT
- MENUITEM "&Copy", ID_EDIT_COPY
- MENUITEM "&Paste", ID_EDIT_PASTE
+ MENUITEM "&Couper", ID_EDIT_CUT
+ MENUITEM "Co&pier", ID_EDIT_COPY
+ MENUITEM "Co&ller", ID_EDIT_PASTE
END
END
@@ -142,7 +142,7 @@
MENUITEM "&Ouvrir...\tCtrl+O", ID_FILE_OPEN
MENUITEM SEPARATOR
MENUITEM "Ouvrir un &projet...\tCtrl+J", ID_FILE_OPENPROJECT
- MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT
+ MENUITEM "&Enregistrer un Project...", ID_FILE_SAVEPROJECT
MENUITEM SEPARATOR
MENUITEM "&Quitter", ID_APP_EXIT
END
@@ -174,9 +174,9 @@
MENUITEM SEPARATOR
MENUITEM "&Recharger les plugiciels", ID_RELOAD_PLUGINS
END
- POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
+ POPUP "&D\xE9boguer" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
- MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Charger la configuration...", ID_DEBUG_LOADCONFIG
END
POPUP "Fe&n\xEAtre"
BEGIN
@@ -193,7 +193,7 @@
BEGIN
MENUITEM "&Rubriques d'aide\tF1", ID_HELP_CONTENTS
MENUITEM "&Index...", ID_HELP_INDEX
- MENUITEM "&Search...", ID_HELP_SEARCH
+ MENUITEM "Rec&hercher...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "C&onfiguration...", ID_HELP_GETCONFIG
MENUITEM "&Support d'archives disqualifi\xE9...", ID_HELP_MERGE7ZMISMATCH
@@ -211,12 +211,12 @@
MENUITEM "&Ouvrir...\tCtrl+O", ID_FILE_OPEN
MENUITEM SEPARATOR
MENUITEM "Ouvrir un &projet...\tCtrl+J", ID_FILE_OPENPROJECT
- MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT
+ MENUITEM "&Enregistrer un Project...", ID_FILE_SAVEPROJECT
MENUITEM SEPARATOR
MENUITEM "C\xF4t\xE9 gauc&he lecture seulement", ID_FILE_LEFT_READONLY
MENUITEM "C\xF4t\xE9 droi&t lecture seulement", ID_FILE_RIGHT_READONLY
MENUITEM SEPARATOR
- MENUITEM "File Enc&oding", ID_FILE_ENCODING
+ MENUITEM "Encodage de &fichier", ID_FILE_ENCODING
MENUITEM SEPARATOR
MENUITEM "&Quitter", ID_APP_EXIT
END
@@ -227,16 +227,16 @@
MENUITEM "&Pr\xE9f\xE9rences...", ID_OPTIONS
MENUITEM SEPARATOR
MENUITEM "Actual&iser\tF5", ID_REFRESH
- MENUITEM "&Refresh Selected\tCtrl+F5", ID_DIR_RESCAN
+ MENUITEM "Actualiser la &s\xE9lection\tCtrl+F5", ID_DIR_RESCAN
END
POPUP "&Affichage"
BEGIN
- MENUITEM "Show &Identical Items", ID_OPTIONS_SHOWIDENTICAL
- MENUITEM "Show &Different Items", ID_OPTIONS_SHOWDIFFERENT
- MENUITEM "Show L&eft Unique Items", ID_OPTIONS_SHOWUNIQUELEFT
- MENUITEM "Show Ri&ght Unique Items", ID_OPTIONS_SHOWUNIQUERIGHT
- MENUITEM "Show S&kipped Items", ID_OPTIONS_SHOWSKIPPED
- MENUITEM "S&how Binary Files", ID_OPTIONS_SHOWBINARIES
+ MENUITEM "Fichiers &identiques", ID_OPTIONS_SHOWIDENTICAL
+ MENUITEM "Fichiers &diff\xE9rents", ID_OPTIONS_SHOWDIFFERENT
+ MENUITEM "Fichiers uniquement \xE0 &gauche", ID_OPTIONS_SHOWUNIQUELEFT
+ MENUITEM "Fichiers uniquement \xE0 d&roite", ID_OPTIONS_SHOWUNIQUERIGHT
+ MENUITEM "Fichiers ig&nor\xE9s", ID_OPTIONS_SHOWSKIPPED
+ MENUITEM "Fichiers &binaires", ID_OPTIONS_SHOWBINARIES
MENUITEM SEPARATOR
MENUITEM "Afficher les \xE9l\xE9ments cach\xE9s", ID_VIEW_SHOWHIDDENITEMS
MENUITEM SEPARATOR
@@ -245,7 +245,7 @@
MENUITEM SEPARATOR
MENUITEM "Barre d'&outils", ID_VIEW_TOOLBAR
MENUITEM "Barre d'&\xE9tat", ID_VIEW_STATUS_BAR
- MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
+ MENUITEM "Comparer les &statistiques", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "&Langage...", ID_VIEW_LANGUAGE
END
@@ -281,9 +281,9 @@
MENUITEM SEPARATOR
MENUITEM "&Recharger les plugiciels", ID_RELOAD_PLUGINS
END
- POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
+ POPUP "&D\xE9boguer" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
- MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Charger la configuration...", ID_DEBUG_LOADCONFIG
END
POPUP "Fe&n\xEAtre"
BEGIN
@@ -300,7 +300,7 @@
BEGIN
MENUITEM "&Rubriques d'aide\tF1", ID_HELP_CONTENTS
MENUITEM "&Index...", ID_HELP_INDEX
- MENUITEM "&Search...", ID_HELP_SEARCH
+ MENUITEM "Rec&hercher...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "C&onfiguration...", ID_HELP_GETCONFIG
MENUITEM "&Support d'archives disqualifi\xE9...", ID_HELP_MERGE7ZMISMATCH
@@ -318,7 +318,7 @@
MENUITEM "&Ouvrir...\tCtrl+O", ID_FILE_OPEN
MENUITEM SEPARATOR
MENUITEM "Ouvrir un &projet...\tCtrl+J", ID_FILE_OPENPROJECT
- MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT
+ MENUITEM "&Enregistrer un Project...", ID_FILE_SAVEPROJECT
MENUITEM SEPARATOR
MENUITEM "&Enregistrer\tCtrl+S", ID_FILE_SAVE
POPUP "Enregistrer \xE0 &gauche"
@@ -332,13 +332,13 @@
MENUITEM "Enregistrer &sous...", ID_FILE_SAVEAS_RIGHT
END
MENUITEM SEPARATOR
- MENUITEM "&Print...", ID_FILE_PRINT
- MENUITEM "Print P&review", ID_FILE_PRINT_PREVIEW
+ MENUITEM "&Imprimer...", ID_FILE_PRINT
+ MENUITEM "&Aper\xE7u avant impression", ID_FILE_PRINT_PREVIEW
MENUITEM SEPARATOR
MENUITEM "C\xF4t\xE9 gauc&he lecture seulement", ID_FILE_LEFT_READONLY
MENUITEM "C\xF4t\xE9 droi&t lecture seulement", ID_FILE_RIGHT_READONLY
MENUITEM SEPARATOR
- POPUP "&Convert Line Endings to"
+ POPUP "&Rendre au format"
BEGIN
MENUITEM "&DOS (CRLF)", ID_EOL_TO_DOS
MENUITEM "&UNIX (LF)", ID_EOL_TO_UNIX
@@ -358,7 +358,7 @@
MENUITEM "Co&pier\tCtrl+C", ID_EDIT_COPY
MENUITEM "Co&ller\tCtrl+V", ID_EDIT_PASTE
MENUITEM SEPARATOR
- MENUITEM "Select Line &Difference\tF4", ID_SELECTLINEDIFF
+ MENUITEM "&S\xE9lectionner la distinction\tF4", ID_SELECTLINEDIFF
MENUITEM "S\xE9lectionner &tout\tCtrl+A", ID_EDIT_SELECT_ALL
MENUITEM SEPARATOR
MENUITEM "&Rechercher...\tCtrl+F", ID_EDIT_FIND
@@ -374,12 +374,12 @@
MENUITEM "&Copier avec des num\xE9ros de ligne\tCtrl+Shift+C",
ID_EDIT_COPY_LINENUMBERS
END
- POPUP "&Bookmarks"
+ POPUP "&Signets"
BEGIN
- MENUITEM "&Toggle Bookmark\tCtrl+F2", ID_EDIT_TOGGLE_BOOKMARK
- MENUITEM "&Next Bookmark\tF2", ID_EDIT_GOTO_NEXT_BOOKMARK
- MENUITEM "&Previous bookmark\tShift+F2", ID_EDIT_GOTO_PREV_BOOKMARK
- MENUITEM "&Clear All Bookmarks", ID_EDIT_CLEAR_ALL_BOOKMARKS
+ MENUITEM "&Activer les signets\tCtrl+F2", ID_EDIT_TOGGLE_BOOKMARK
+ MENUITEM "Signet &suivant\tF2", ID_EDIT_GOTO_NEXT_BOOKMARK
+ MENUITEM "Signet &pr\xE9c\xE9dent\tShift+F2", ID_EDIT_GOTO_PREV_BOOKMARK
+ MENUITEM "&Effacer tous les signets", ID_EDIT_CLEAR_ALL_BOOKMARKS
END
MENUITEM "&Atteindre...\tCtrl+G", ID_EDIT_WMGOTO
MENUITEM SEPARATOR
@@ -393,11 +393,11 @@
MENUITEM "&Utiliser la police par d\xE9faut", ID_VIEW_USEDEFAULTFONT
MENUITEM SEPARATOR
MENUITEM "&Afficher les espaces", ID_VIEW_WHITESPACE
- MENUITEM "Afficher la granularit\xE9 des lignes", ID_VIEW_LINEDIFFS
- MENUITEM "View Line &Numbers", ID_VIEW_LINENUMBERS
- MENUITEM "W&rap Lines", ID_VIEW_WORDWRAP
+ MENUITEM "Afficher la granularit\xE9 des lignes", ID_VIEW_LINEDIFFS
+ MENUITEM "Afficher la num\xE9rotation des lignes", ID_VIEW_LINENUMBERS
+ MENUITEM "&Retour \xE0 la ligne automatique", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
- MENUITEM "Sw&ap Panes", ID_VIEW_SWAPPANES
+ MENUITEM "&Intervertir les fen\xEAtres", ID_VIEW_SWAPPANES
MENUITEM SEPARATOR
MENUITEM "Barre d'&outils", ID_VIEW_TOOLBAR
MENUITEM "Barre d'&\xE9tat", ID_VIEW_STATUS_BAR
@@ -443,9 +443,9 @@
MENUITEM SEPARATOR
MENUITEM "&Recharger les plugiciels", ID_RELOAD_PLUGINS
END
- POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
+ POPUP "&D\xE9boguer" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
- MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Charger la configuration...", ID_DEBUG_LOADCONFIG
END
POPUP "Fe&n\xEAtre"
BEGIN
@@ -462,7 +462,7 @@
BEGIN
MENUITEM "&Rubriques d'aide\tF1", ID_HELP_CONTENTS
MENUITEM "&Index...", ID_HELP_INDEX
- MENUITEM "&Search...", ID_HELP_SEARCH
+ MENUITEM "Rec&hercher...", ID_HELP_SEARCH
MENUITEM SEPARATOR
MENUITEM "C&onfiguration...", ID_HELP_GETCONFIG
MENUITEM "&Support d'archives disqualifi\xE9...", ID_HELP_MERGE7ZMISMATCH
@@ -496,7 +496,7 @@
MENUITEM "\xE0 &droite", ID_DIR_DEL_RIGHT
MENUITEM "des deu&x c\xF4t\xE9s", ID_DIR_DEL_BOTH
END
- MENUITEM "Re&name", ID_DIR_ITEM_RENAME
+ MENUITEM "Re&nommer", ID_DIR_ITEM_RENAME
MENUITEM "D&issimuler l'\xE9l\xE9ment(s)", ID_DIR_HIDE_FILENAMES
MENUITEM SEPARATOR
POPUP "Ouvrir \xE0 &gauche"
@@ -673,7 +673,7 @@
LTEXT "Statut:",IDC_OPEN_STATUS,15,102,192,8
DEFPUSHBUTTON "OK",IDOK,316,11,50,14
PUSHBUTTON "Ann&uler",IDCANCEL,316,28,50,14
- PUSHBUTTON "Help",ID_HELP,316,45,50,14
+ PUSHBUTTON "Aide",ID_HELP,316,45,50,14
GROUPBOX "Fichiers ou r\xE9pertoires \xE0 comparer :",IDC_FILES_DIRS_GROUP,7,
7,302,111
END
@@ -737,8 +737,8 @@
WS_TABSTOP,7,47,206,10
CONTROL "&Permetre une seule instance en ex\xE9cution",IDC_SINGLE_INSTANCE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
- LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST |
+ LTEXT "Automatisation bo\xEEte de dialogue d'ouverture",IDC_STATIC,19,72,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
GROUPBOX "Qualifier plusieurs fen\xEAtres pour",IDC_STATIC,7,100,
221,37
@@ -746,7 +746,7 @@
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
CONTROL "comparaison de &Fichiers",IDC_MULTIDOC_FILECMP,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
- LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
+ LTEXT "WinMerge permet de dissimuler certaines bo\xEEtes de message. Appuyer sur ce bouton pour les rendre visibles \xE0 nouveau.",
IDC_STATIC,7,153,168,31
PUSHBUTTON "&Initialiser",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
WS_TABSTOP
@@ -780,7 +780,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,7,37,135,10
CONTROL "E&xpressions r\xE9guli\xE8res",IDC_EDIT_REGEXP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,47,135,10
- CONTROL "D&on't wrap end of file",IDC_FINDDLG_DONTWRAP,"Button",
+ CONTROL "Pas de retour automatique \xE0 la ligne",IDC_FINDDLG_DONTWRAP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,57,135,10
GROUPBOX "Direction",IDC_STATIC,148,23,70,36,WS_GROUP
CONTROL "Vers le &Haut",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON |
@@ -834,9 +834,9 @@
EDITTEXT IDC_COMMENTS,18,21,243,56,ES_MULTILINE | ES_AUTOVSCROLL |
ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
LTEXT "Commentaires",IDC_STATIC,18,7,80,10
- CONTROL "Apply to all items",IDC_MULTI_CHECKOUT,"Button",
+ CONTROL "Appliquer \xE0 tous les \xE9l\xE9ments",IDC_MULTI_CHECKOUT,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,83,235,8
- CONTROL "CheckIn after checkout",IDC_CHECKIN,"Button",
+ CONTROL "Inscrire apr\xE8s extraction",IDC_CHECKIN,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8
END
@@ -955,14 +955,14 @@
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,41,200,10
CONTROL "&Qualifier le menu avanc\xE9",IDC_EXPLORER_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,51,200,10
- CONTROL "In&clude subfolders by default",IDC_EXPLORER_SUBFOLDERS,
+ CONTROL "In&clure les sous-r\xE9pertoires par d\xE9faut",IDC_EXPLORER_SUBFOLDERS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,61,200,10
LTEXT "E&diteur externe:",IDC_STATIC,7,83,222,8
EDITTEXT IDC_EXT_EDITOR_PATH,7,93,167,14,ES_AUTOHSCROLL
PUSHBUTTON "&Parcourir...",IDC_EXT_EDITOR_BROWSE,179,93,50,14
- LTEXT "&Filter folder:",IDC_STATIC,7,111,166,8
+ LTEXT "&R\xE9pertoire de filtre:",IDC_STATIC,7,111,166,8
EDITTEXT IDC_FILTER_USER_PATH,7,121,167,14,ES_AUTOHSCROLL
- PUSHBUTTON "Browse...",IDC_FILTER_USER_BROWSE,179,121,50,14
+ PUSHBUTTON "Parc&ourir...",IDC_FILTER_USER_BROWSE,179,121,50,14
END
IDD_GENERATE_PATCH DIALOGEX 0, 0, 340, 180
@@ -1073,17 +1073,17 @@
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
WS_CAPTION
EXSTYLE WS_EX_TOOLWINDOW
-CAPTION " Folder Compare Progress"
+CAPTION "Progression de la comparaison"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,167,15,83,14
+ DEFPUSHBUTTON "Arr\xEAter",IDC_COMPARISON_STOP,167,15,83,14
CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,9,
44,241,9
RTEXT "0",IDC_ITEMSCOMPARED,95,29,30,8
RTEXT "0",IDC_ITEMSTOTAL,95,19,30,8
- LTEXT "Comparing items...",IDC_STATIC,7,7,150,8
- LTEXT "Items compared:",IDC_STATIC,7,29,85,8
- LTEXT "Items total:",IDC_STATIC,7,19,85,8
+ LTEXT "Comparaison des \xE9l\xE9ments...",IDC_STATIC,7,7,150,8
+ LTEXT "\xC9l\xE9ments compar\xE9s:",IDC_STATIC,7,29,85,8
+ LTEXT "\xC9l\xE9ments au total:",IDC_STATIC,7,19,85,8
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
@@ -1095,12 +1095,12 @@
LTEXT "A&tteindre:",IDC_STATIC,7,9,36,8
EDITTEXT IDC_WMGOTO_PARAM,45,7,102,14,ES_AUTOHSCROLL | ES_NUMBER
GROUPBOX "Fichier",IDC_STATIC,7,27,57,35
- CONTROL "&Gauche",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON |
+ CONTROL "&Gauche",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON |
WS_GROUP,13,38,48,10
CONTROL "&Droit",IDC_WMGOTO_FILERIGHT,"Button",
BS_AUTORADIOBUTTON,13,48,47,10
GROUPBOX "Atteindre quoi",IDC_STATIC,69,27,78,35
- CONTROL "&Ligne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON |
+ CONTROL "&Ligne",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON |
WS_GROUP,76,38,68,10
CONTROL "Di&ff\xE9rence",IDC_WMGOTO_TODIFF,"Button",
BS_AUTORADIOBUTTON,76,48,68,10
@@ -1134,8 +1134,8 @@
WS_VSCROLL | WS_TABSTOP
CONTROL "&Arr\xEAter \xE0 la premi\xE8re diff\xE9rence",IDC_COMPARE_STOPFIRST,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10
- GROUPBOX "Comments",IDC_STATIC,7,134,221,32
- CONTROL "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button",
+ GROUPBOX "Commentaires",IDC_STATIC,7,134,221,32
+ CONTROL "Filtrer les commentaires",IDC_FILTERCOMMENTS_CHECK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
PUSHBUTTON "&D\xE9fauts",IDC_COMPARE_DEFAULTS,7,179,50,14
END
@@ -1163,9 +1163,9 @@
221,41
CONTROL "A&fficher les diff\xE9rences",IDC_VIEW_LINE_DIFFERENCES,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,14,98,100,8
- CONTROL "&Character level",IDC_EDITOR_CHARLEVEL,"Button",
+ CONTROL "Pr\xE9cision au &caract\xE8re",IDC_EDITOR_CHARLEVEL,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,14,108,138,10
- CONTROL "&Word-level:",IDC_EDITOR_WORDLEVEL,"Button",
+ CONTROL "Pr\xE9cision au &mot",IDC_EDITOR_WORDLEVEL,"Button",
BS_AUTORADIOBUTTON,14,118,122,10
COMBOBOX IDC_BREAK_TYPE,24,130,143,34,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_GROUP | WS_TABSTOP
@@ -1187,7 +1187,7 @@
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER |
WS_BORDER | WS_TABSTOP,7,7,342,100
PUSHBUTTON "Test",IDC_FILTERFILE_TEST_BTN,7,114,50,14
- PUSHBUTTON "Install...",IDC_FILTERFILE_INSTALL,137,114,50,14
+ PUSHBUTTON "Installer...",IDC_FILTERFILE_INSTALL,137,114,50,14
PUSHBUTTON "&Nouveau...",IDC_FILTERFILE_NEWBTN,192,114,50,14
PUSHBUTTON "\xC9&diter...",IDC_FILTERFILE_EDITBTN,246,114,50,14
PUSHBUTTON "&Supprimer...",IDC_FILTERFILE_DELETEBTN,300,114,50,14
@@ -1224,7 +1224,7 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "Page de code par d\xE9faut",IDC_STATIC,7,7,221,79
- LTEXT "Selectionnez la page de code par d\xE9faut qui est assum\xE9 lors du chargement des fichiers non-Unicode:",
+ LTEXT "S\xE9lectionnez la page de code par d\xE9faut qui est assum\xE9 lors du chargement des fichiers non-Unicode:",
IDC_STATIC,14,20,208,19
CONTROL "&D\xE9tecter la page de code pour les fichiers suivants :\n.html, .rc, .xml \nn\xE9c\xE9ssite un red\xE9marrage de session",
IDC_DETECT_CODEPAGE,"Button",BS_AUTOCHECKBOX | BS_TOP |
@@ -1253,7 +1253,7 @@
IDC_STATIC,2,52,296,18
LTEXT "Veuillez utiliser la version 7-Zip recommand\xE9e plus bas jusqu'a \nce qu'une interface plugiciel plus r\xE9cente devienne disponible.",
IDC_STATIC,2,70,296,26
- CTEXT "Version",IDC_STATIC,146,98,56,20,SS_CENTERIMAGE |
+ CTEXT "Version",IDC_STATIC,146,98,56,20,SS_CENTERIMAGE |
SS_SUNKEN
CTEXT "plugiciel requis\n(dllbuild %04u)",102,204,98,94,20,
SS_SUNKEN
@@ -1261,7 +1261,7 @@
SS_CENTERIMAGE
CTEXT "0.00",110,146,120,20,10,SS_CENTERIMAGE | SS_SUNKEN
CTEXT "pr\xE9sente",109,168,120,34,10,SS_CENTERIMAGE | SS_SUNKEN
- CTEXT "Merge7z000U.dll",111,204,120,58,10,SS_CENTERIMAGE |
+ CTEXT "Merge7z000U.dll",111,204,120,58,10,SS_CENTERIMAGE |
SS_SUNKEN
CTEXT "pr\xE9sent",112,264,120,34,10,SS_CENTERIMAGE | SS_SUNKEN
LTEXT "Logiciel 7-Zip install\xE9 sur cet ordinateur:",IDC_STATIC,
@@ -1276,12 +1276,12 @@
CTEXT "p\xE9rim\xE9",132,264,144,34,10,SS_CENTERIMAGE | SS_SUNKEN
LTEXT "Plugiciel sur le chemin principal:",9001,2,160,100,8
CONTROL "Ne plus afficher ce &message.\n(Il peut toujours \xEAtre r\xE9activer au menu des pr\xE9f\xE9rences.)",
- 106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE |
+ 106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE |
WS_TABSTOP,2,225,218,18
DEFPUSHBUTTON "OK",IDOK,236,226,50,14,WS_GROUP
CONTROL "T\xE9l\xE9char. plugiciel",108,"Button",BS_OWNERDRAW | WS_TABSTOP,
236,160,62,10
- LISTBOX 105,2,170,296,52,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
+ LISTBOX 105,2,170,296,52,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
WS_HSCROLL | WS_GROUP | WS_TABSTOP
END
@@ -1301,8 +1301,8 @@
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,230,338,1
LTEXT " Cat\xE9gories",IDC_STATIC,7,7,96,13,SS_CENTERIMAGE |
SS_SUNKEN
- PUSHBUTTON "Import...",IDC_TREEOPT_IMPORT,7,237,50,14
- PUSHBUTTON "Export...",IDC_TREEOPT_EXPORT,62,237,50,14
+ PUSHBUTTON "Importer...",IDC_TREEOPT_IMPORT,7,237,50,14
+ PUSHBUTTON "Exporter...",IDC_TREEOPT_EXPORT,62,237,50,14
END
IDD_PROP_COLORSYNTAX DIALOGEX 0, 0, 235, 214
@@ -1320,50 +1320,50 @@
RTEXT "Usager 1:",IDC_STATIC,0,160,70,8
RTEXT "Usager 2:",IDC_STATIC,0,180,70,8
CTEXT "Texte",IDC_STATIC,73,7,34,8
- CONTROL "Button1",IDC_SCOLOR_KEYWORDS,"Button",BS_OWNERDRAW |
- WS_TABSTOP,83,19,17,14,WS_EX_TRANSPARENT |
+ CONTROL "Button1",IDC_SCOLOR_KEYWORDS,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,83,19,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- CONTROL "Surbrillance",IDC_SCOLOR_KEYWORDS_BOLD,"Button",BS_AUTOCHECKBOX |
+ CONTROL "Surbrillance",IDC_SCOLOR_KEYWORDS_BOLD,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,110,21,55,10
- CONTROL "Button1",IDC_SCOLOR_FUNCTIONS,"Button",BS_OWNERDRAW |
- WS_TABSTOP,83,39,17,14,WS_EX_TRANSPARENT |
+ CONTROL "Button1",IDC_SCOLOR_FUNCTIONS,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,83,39,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
CONTROL "Surbrillance",IDC_SCOLOR_FUNCTIONS_BOLD,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,110,40,55,10
- CONTROL "Button1",IDC_SCOLOR_COMMENTS,"Button",BS_OWNERDRAW |
- WS_TABSTOP,83,59,17,14,WS_EX_TRANSPARENT |
+ CONTROL "Button1",IDC_SCOLOR_COMMENTS,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,83,59,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- CONTROL "Surbrillance",IDC_SCOLOR_COMMENTS_BOLD,"Button",BS_AUTOCHECKBOX |
+ CONTROL "Surbrillance",IDC_SCOLOR_COMMENTS_BOLD,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,110,60,55,10
- CONTROL "Button1",IDC_SCOLOR_NUMBERS,"Button",BS_OWNERDRAW |
- WS_TABSTOP,83,79,17,14,WS_EX_TRANSPARENT |
+ CONTROL "Button1",IDC_SCOLOR_NUMBERS,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,83,79,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- CONTROL "Surbrillance",IDC_SCOLOR_NUMBERS_BOLD,"Button",BS_AUTOCHECKBOX |
+ CONTROL "Surbrillance",IDC_SCOLOR_NUMBERS_BOLD,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,110,80,55,10
- CONTROL "Button1",IDC_SCOLOR_OPERATORS,"Button",BS_OWNERDRAW |
- WS_TABSTOP,83,99,17,14,WS_EX_TRANSPARENT |
+ CONTROL "Button1",IDC_SCOLOR_OPERATORS,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,83,99,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
CONTROL "Surbrillance",IDC_SCOLOR_OPERATORS_BOLD,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,110,100,55,10
- CONTROL "Button1",IDC_SCOLOR_STRINGS,"Button",BS_OWNERDRAW |
- WS_TABSTOP,83,119,17,14,WS_EX_TRANSPARENT |
+ CONTROL "Button1",IDC_SCOLOR_STRINGS,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,83,119,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- CONTROL "Surbrillance",IDC_SCOLOR_STRINGS_BOLD,"Button",BS_AUTOCHECKBOX |
+ CONTROL "Surbrillance",IDC_SCOLOR_STRINGS_BOLD,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,110,120,55,10
- CONTROL "Button1",IDC_SCOLOR_PREPROCESSOR,"Button",BS_OWNERDRAW |
- WS_TABSTOP,83,139,17,14,WS_EX_TRANSPARENT |
+ CONTROL "Button1",IDC_SCOLOR_PREPROCESSOR,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,83,139,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
CONTROL "Surbrillance",IDC_SCOLOR_PREPROCESSOR_BOLD,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,110,140,55,10
- CONTROL "Button1",IDC_SCOLOR_USER1,"Button",BS_OWNERDRAW |
- WS_TABSTOP,83,159,17,14,WS_EX_TRANSPARENT |
+ CONTROL "Button1",IDC_SCOLOR_USER1,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,83,159,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- CONTROL "Surbrillance",IDC_SCOLOR_USER1_BOLD,"Button",BS_AUTOCHECKBOX |
+ CONTROL "Surbrillance",IDC_SCOLOR_USER1_BOLD,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,110,160,55,10
- CONTROL "Button1",IDC_SCOLOR_USER2,"Button",BS_OWNERDRAW |
- WS_TABSTOP,83,179,17,14,WS_EX_TRANSPARENT |
+ CONTROL "Button1",IDC_SCOLOR_USER2,"Button",BS_OWNERDRAW |
+ WS_TABSTOP,83,179,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- CONTROL "Surbrillance",IDC_SCOLOR_USER2_BOLD,"Button",BS_AUTOCHECKBOX |
+ CONTROL "Surbrillance",IDC_SCOLOR_USER2_BOLD,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,110,180,55,10
PUSHBUTTON "Defauts",IDC_SCOLORS_BDEFAULTS,182,179,50,14
END
@@ -1375,13 +1375,13 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Fichier du &rapport:",IDC_STATIC,7,7,150,8
- COMBOBOX IDC_REPORT_FILE,7,17,197,70,CBS_DROPDOWN | WS_VSCROLL |
+ COMBOBOX IDC_REPORT_FILE,7,17,197,70,CBS_DROPDOWN | WS_VSCROLL |
CBS_AUTOHSCROLL | WS_TABSTOP
PUSHBUTTON "Parcourir...",IDC_REPORT_BROWSEFILE,211,18,50,14
LTEXT "&Style:",IDC_STATIC,7,37,35,8
- COMBOBOX IDC_REPORT_STYLECOMBO,46,35,158,70,CBS_DROPDOWNLIST |
+ COMBOBOX IDC_REPORT_STYLECOMBO,46,35,158,70,CBS_DROPDOWNLIST |
CBS_SORT | WS_VSCROLL | WS_TABSTOP
- CONTROL "&Copy to Clipboard",IDC_REPORT_COPYCLIPBOARD,"Button",
+ CONTROL "&Copier au presse-papiers",IDC_REPORT_COPYCLIPBOARD,"Button",
BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,7,53,133,10
DEFPUSHBUTTON "OK",IDOK,157,60,50,14
PUSHBUTTON "Ann&uler",IDCANCEL,211,60,50,14
@@ -1399,7 +1399,7 @@
CONTROL "Filtre priv\xE9 (pour l'usager actuel seulement)",IDC_PRIVATE,"Button",
BS_AUTORADIOBUTTON,20,37,223,10
DEFPUSHBUTTON "OK",IDOK,65,55,50,14
- PUSHBUTTON "Cancel",IDCANCEL,135,55,50,14
+ PUSHBUTTON "Ann&uler",IDCANCEL,135,55,50,14
END
IDD_PROP_ARCHIVE DIALOGEX 0, 0, 235, 126
@@ -1413,47 +1413,47 @@
CONTROL "&Qualifier le support d'archives",IDC_ARCHIVE_ENABLE,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,37,221,10
CONTROL "&Utiliser le mode autonome de 7-Zip si disponible",
- IDC_ARCHIVE_INSTALSTANDALONE,"Button",BS_AUTORADIOBUTTON |
+ IDC_ARCHIVE_INSTALSTANDALONE,"Button",BS_AUTORADIOBUTTON |
WS_GROUP | WS_TABSTOP,19,48,209,10
CONTROL "U&tiliser les composants locaux de 7-Zip (r\xE9pertoire WinMerge)",IDC_ARCHIVE_INSTALLOCAL,"Button",
BS_AUTORADIOBUTTON,19,58,209,10
CONTROL "&Detecter le type d'archives avec un fichier de signature",
- IDC_ARCHIVE_DETECTTYPE,"Button",BS_AUTOCHECKBOX |
+ IDC_ARCHIVE_DETECTTYPE,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,70,221,10
END
IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Compare Statistics"
+CAPTION "Statistiques de comparaison"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "Folders:",IDC_STATIC,72,7,38,8
- LTEXT "Files:",IDC_STATIC,131,7,39,8
- GROUPBOX "Different",IDC_STATIC,7,15,186,40
- RTEXT "Text:",IDC_STATIC,11,26,56,8
+ LTEXT "R\xE9pertoires:",IDC_STATIC,72,7,38,8
+ LTEXT "Fichiers:",IDC_STATIC,131,7,39,8
+ GROUPBOX "Diff\xE9rent",IDC_STATIC,7,15,186,40
+ RTEXT "Texte:",IDC_STATIC,11,26,56,8
ICON "",IDC_STAT_INOTEQUAL,131,24,16,16
RTEXT "Static",IDC_STAT_DIFFFILE,146,25,38,10,SS_SUNKEN
- RTEXT "Binary:",IDC_STATIC,10,40,56,8
+ RTEXT "Binaire:",IDC_STATIC,10,40,56,8
ICON "",IDC_STAT_IDIFFBINFILE, 131,37,16,16
RTEXT "Static",IDC_STAT_DIFFBINARY,146,38,38,10,SS_SUNKEN
GROUPBOX "Unique",IDC_STATIC,7,55,186,40
- RTEXT "Left:",IDC_STATIC,11,66,56,8
+ RTEXT "Gauche:",IDC_STATIC,11,66,56,8
ICON "",IDC_STAT_ILUNIQFOLDER,72,64,16,16
RTEXT "Static",IDC_STAT_LUNIQFOLDER,86,65,38,10,SS_SUNKEN
ICON "",IDC_STAT_ILUNIQFILE,131,64,16,16
RTEXT "Static",IDC_STAT_LUNIQFILE,146,65,38,10,SS_SUNKEN
- RTEXT "Right:",IDC_STATIC,11,79,56,8
+ RTEXT "Droit:",IDC_STATIC,11,79,56,8
ICON "",IDC_STAT_IRUNIQFOLDER,72,77,16,16
RTEXT "Static",IDC_STAT_RUNIQFOLDER,86,78,38,10,SS_SUNKEN
ICON "",IDC_STAT_IRUNIQFILE,131,77,16,16
RTEXT "Static",IDC_STAT_RUNIQFILE,146,78,38,10,SS_SUNKEN
- GROUPBOX "Identical",IDC_STATIC,7,95,186,37
+ GROUPBOX "Identique",IDC_STATIC,7,95,186,37
ICON "",IDC_STAT_IIDENTICFOLDER,72,102,16,16
RTEXT "Static",IDC_STAT_IDENTICFOLDER,86,103,38,10,SS_SUNKEN
ICON "",IDC_STAT_IEQUALFILE,131,102,16,16
RTEXT "Static",IDC_STAT_IDENTICFILE,146,103,38,10,SS_SUNKEN
- RTEXT "Binary:",IDC_STATIC,10,117,56,8
+ RTEXT "Binaire:",IDC_STATIC,10,117,56,8
ICON "",IDC_STAT_IEQUALBINFILE,131,115,16,16
RTEXT "Static",IDC_STAT_IDENTICBINARY,146,116,38,10,SS_SUNKEN
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,136,186,1
@@ -1462,108 +1462,108 @@
RTEXT "Static",IDC_STAT_TOTALFOLDER,86,141,38,10,SS_SUNKEN
ICON "",IDC_STAT_ITOTALFILES,131,140,16,16
RTEXT "Static",IDC_STAT_TOTALFILE,146,141,38,10,SS_SUNKEN
- DEFPUSHBUTTON "Close",IDOK,200,140,50,14
+ DEFPUSHBUTTON "Fermer",IDOK,200,140,50,14
END
IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU | WS_THICKFRAME
-CAPTION "Codepage"
+CAPTION "Code de page"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- GROUPBOX "Affects",IDC_AFFECTS_GROUP,5,7,166,36
- CONTROL "&Left",IDC_AFFECTS_LEFT_BTN,"Button",BS_AUTOCHECKBOX |
+ GROUPBOX "Affectations",IDC_AFFECTS_GROUP,5,7,166,36
+ CONTROL "&Gauche",IDC_AFFECTS_LEFT_BTN,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,12,18,54,8
- LTEXT "(Affects)",IDC_LEFT_FILES_LABEL,70,18,93,8
- CONTROL "&Right",IDC_AFFECTS_RIGHT_BTN,"Button",BS_AUTOCHECKBOX |
+ LTEXT "(Affect\xE9)",IDC_LEFT_FILES_LABEL,70,18,93,8
+ CONTROL "&Droit",IDC_AFFECTS_RIGHT_BTN,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,12,29,54,8
- LTEXT "(Affects)",IDC_RIGHT_FILES_LABEL,70,29,93,8
- GROUPBOX "Select Codepage for",IDC_LOADING_GROUP,5,48,166,63
- LTEXT "&File Loading:",IDC_LOAD_FILES_LABEL,12,64,72,10
+ LTEXT "(Affect\xE9)",IDC_RIGHT_FILES_LABEL,70,29,93,8
+ GROUPBOX "S\xE9lectionner le code de page",IDC_LOADING_GROUP,5,48,166,63
+ LTEXT "&Chargement de fichier:",IDC_LOAD_FILES_LABEL,12,64,72,10
EDITTEXT IDC_LOAD_CODEPAGE_TEXTBOX,86,63,45,12,ES_AUTOHSCROLL
PUSHBUTTON "...",IDC_LOAD_CODEPAGE_BROWSE,139,64,23,10
- LTEXT "File &Saving:",IDC_SAVE_FILES_LABEL,12,79,67,10
+ LTEXT "&Enregistrement de fichier:",IDC_SAVE_FILES_LABEL,12,79,67,10
EDITTEXT IDC_SAVE_CODEPAGE_TEXTBOX,86,79,45,12,ES_AUTOHSCROLL
PUSHBUTTON "...",IDC_SAVE_CODEPAGE_BROWSE,139,80,23,10
- CONTROL "&Use same codepage for both",
- IDC_LOAD_SAVE_SAME_CODEPAGE,"Button",BS_AUTOCHECKBOX |
+ CONTROL "&Utiliser le m\xEAme pour les deux",
+ IDC_LOAD_SAVE_SAME_CODEPAGE,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,12,96,150,10
- DEFPUSHBUTTON "&Apply",IDOK,65,117,50,14
- PUSHBUTTON "&Cancel",IDCANCEL,121,117,50,14
+ DEFPUSHBUTTON "&Appliquer",IDOK,65,117,50,14
+ PUSHBUTTON "Ann&uler",IDCANCEL,121,117,50,14
END
IDD_TEST_FILTER DIALOGEX 0, 0, 249, 142
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
-CAPTION "Test Filter"
+CAPTION "Filtre de test"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "Testing filter ...",IDC_HEADER,7,7,82,8
- LTEXT "(filter name)",IDC_HEADER_FILTER_NAME,90,6,152,8
- LTEXT "&Enter text to test:",IDC_PROMPT_LABEL,7,21,80,8
+ LTEXT "Tester le filtre ...",IDC_HEADER,7,7,82,8
+ LTEXT "(nom du filtre)",IDC_HEADER_FILTER_NAME,90,6,152,8
+ LTEXT "&Saisir le texte \xE0 tester:",IDC_PROMPT_LABEL,7,21,80,8
EDITTEXT IDC_TEST_TEXT,90,19,152,12,ES_AUTOHSCROLL
- CONTROL "&Folder Name",IDC_IS_DIRECTORY,"Button",BS_AUTOCHECKBOX |
+ CONTROL "&Nom de r\xE9pertoire",IDC_IS_DIRECTORY,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,36,92,8
- LTEXT "Result:",IDC_STATIC,7,49,34,8
- EDITTEXT IDC_RESULTS,7,59,235,57,ES_MULTILINE | ES_AUTOVSCROLL |
- ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL |
+ LTEXT "Resultat:",IDC_STATIC,7,49,34,8
+ EDITTEXT IDC_RESULTS,7,59,235,57,ES_MULTILINE | ES_AUTOVSCROLL |
+ ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL |
NOT WS_TABSTOP
- DEFPUSHBUTTON "&Test",IDC_TEST_BTN,133,121,50,14
- PUSHBUTTON "&Close",IDCANCEL,192,121,50,14
+ DEFPUSHBUTTON "&Tester",IDC_TEST_BTN,133,121,50,14
+ PUSHBUTTON "&Fermer",IDCANCEL,192,121,50,14
END
IDD_PROPPAGE_COLORS_TEXT DIALOGEX 0, 0, 197, 157
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
-CAPTION "Dialog"
+CAPTION "Dialogue"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Use customized text colors",
- IDC_DEFAULT_STANDARD_COLORS,"Button",BS_AUTOCHECKBOX |
+ CONTROL "&Utiliser les couleurs de texte ajust\xE9es",
+ IDC_DEFAULT_STANDARD_COLORS,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,25,14,161,10
- GROUPBOX "Custom text colors",IDC_CUSTOM_COLORS_GROUP,27,33,159,
+ GROUPBOX "Couleurs de texte ajust\xE9es",IDC_CUSTOM_COLORS_GROUP,27,33,159,
111
- LTEXT "Whitespace:",IDC_WHITESPACE_COLOR_LABEL,31,58,46,10
- LTEXT "Regular text:",IDC_TEXT_COLOR_LABEL,31,87,61,8
- LTEXT "Selection:",IDC_SELECTION_COLOR_LABEL,31,116,61,8
- CTEXT "Background",IDC_BACKGROUND_COLUMN_LABEL,96,44,50,8
- CTEXT "Text",IDC_TEXT_COLUMN_LABEL,145,44,29,8
- CONTROL "Btn",IDC_WHITESPACE_BKGD_COLOR,"Button",BS_OWNERDRAW |
+ LTEXT "Caract\xE8re espace:",IDC_WHITESPACE_COLOR_LABEL,31,58,46,10
+ LTEXT "Texte r\xE9gulier:",IDC_TEXT_COLOR_LABEL,31,87,61,8
+ LTEXT "S\xE9lection:",IDC_SELECTION_COLOR_LABEL,31,116,61,8
+ CTEXT "Arri\xE8re plan",IDC_BACKGROUND_COLUMN_LABEL,96,44,50,8
+ CTEXT "Texte",IDC_TEXT_COLUMN_LABEL,145,44,29,8
+ CONTROL "Btn",IDC_WHITESPACE_BKGD_COLOR,"Button",BS_OWNERDRAW |
WS_TABSTOP,113,58,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- CONTROL "Btn",IDC_REGULAR_BKGD_COLOR,"Button",BS_OWNERDRAW |
+ CONTROL "Btn",IDC_REGULAR_BKGD_COLOR,"Button",BS_OWNERDRAW |
WS_TABSTOP,113,87,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- CONTROL "Btn",IDC_SELECTION_BKGD_COLOR,"Button",BS_OWNERDRAW |
+ CONTROL "Btn",IDC_SELECTION_BKGD_COLOR,"Button",BS_OWNERDRAW |
WS_TABSTOP,113,116,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- CONTROL "Btn",IDC_SELECTION_TEXT_COLOR,"Button",BS_OWNERDRAW |
+ CONTROL "Btn",IDC_SELECTION_TEXT_COLOR,"Button",BS_OWNERDRAW |
WS_TABSTOP,156,116,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- CONTROL "Btn",IDC_REGULAR_TEXT_COLOR,"Button",BS_OWNERDRAW |
+ CONTROL "Btn",IDC_REGULAR_TEXT_COLOR,"Button",BS_OWNERDRAW |
WS_TABSTOP,156,87,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
END
IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 124
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Paths"
+CAPTION "Chemins"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- RTEXT "&Left:",IDC_STATIC,7,11,40,8
+ RTEXT "&Gauche:",IDC_STATIC,7,11,40,8
EDITTEXT IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL
- PUSHBUTTON "Browse...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
- CONTROL "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
- RTEXT "&Right:",IDC_STATIC,7,42,40,8
+ PUSHBUTTON "Parcourir...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
+ CONTROL "Lecture seule",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
+ RTEXT "&Droit:",IDC_STATIC,7,42,40,8
EDITTEXT IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL
- PUSHBUTTON "Browse...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
- CONTROL "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
- RTEXT "&Filter:",IDC_STATIC,7,74,40,8
+ PUSHBUTTON "Parcourir...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
+ CONTROL "Lecture seule",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
+ RTEXT "&Filtre:",IDC_STATIC,7,74,40,8
EDITTEXT IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL
- PUSHBUTTON "Select...",IDC_PROJ_FILTER_SELECT,265,72,50,14
- CONTROL "&Include Subfolders",IDC_PROJ_INC_SUBFOLDERS,"Button",
+ PUSHBUTTON "S\xE9lectionner...",IDC_PROJ_FILTER_SELECT,265,72,50,14
+ CONTROL "&Inclure les sous-r\xE9pertoires",IDC_PROJ_INC_SUBFOLDERS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10
- PUSHBUTTON "Open...",IDC_PROJ_OPEN,211,103,50,14
- PUSHBUTTON "Save...",IDC_PROJ_SAVE,265,103,50,14
+ PUSHBUTTON "Ouvrir...",IDC_PROJ_OPEN,211,103,50,14
+ PUSHBUTTON "Enregistrer...",IDC_PROJ_SAVE,265,103,50,14
END
#ifndef _MAC
@@ -1589,11 +1589,11 @@
BEGIN
BLOCK "040c04e4"
BEGIN
- VALUE "Comments", "Translated by Gil Andre, continued by Laurent Ganier\0"
+ VALUE "Comments", "Traduit par Gil Andre, poursuivi par Laurent Ganier et Jean-Fran\xE7ois Jolin\0"
VALUE "FileDescription", "WinMerge Application\0"
VALUE "FileVersion", "000.000.000.000\0"
VALUE "InternalName", "WinMerge\0"
- VALUE "LegalCopyright", "\xA9 1996-2005 Dean P. Grimm / Thingamahoochie Software\0"
+ VALUE "LegalCopyright", "\xA9 1996-2007 Dean P. Grimm / Thingamahoochie Software\0"
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
@@ -1737,13 +1737,13 @@
// WinMerge Project Files
STRINGTABLE
BEGIN
- ID_FILE_OPENPROJECT "Ouvrir un fichier de projet\nFichier de projet (Ctrl+J)"
- IDS_UNK_ERROR_READING_PROJECT "Unknown error attempting to open project file"
- IDS_UNK_ERROR_SAVING_PROJECT "Unknown error attempting to save project file"
- IDS_PROJFILEDLG_CAPTION "Project File"
- IDS_PROJFILE_LOAD_SUCCESS "Project file successfully loaded."
- IDS_PROJFILE_SAVE_SUCCESS "Project file successfully saved."
- ID_FILE_SAVEPROJECT "Save current paths and options to project file\nSave Project File"
+ ID_FILE_OPENPROJECT "Ouvrir un fichier de projet\nFichier de projet (Ctrl+J)"
+ IDS_UNK_ERROR_READING_PROJECT "Erreur ind\xE9termin\xE9e lors de l'ouverture du projet"
+ IDS_UNK_ERROR_SAVING_PROJECT "Erreur ind\xE9termin\xE9e lors de l'enregistrement du projet"
+ IDS_PROJFILEDLG_CAPTION "Fichiers du projet"
+ IDS_PROJFILE_LOAD_SUCCESS "Fichiers du projet correctement charg\xE9s."
+ IDS_PROJFILE_SAVE_SUCCESS "Fichiers du projet correctement enregistr\xE9s."
+ ID_FILE_SAVEPROJECT "Enregistrer les chemins et pr\xE9f\xE9rences au projet\nEnregistrer les fichiers du projet"
END
STRINGTABLE
@@ -1869,8 +1869,8 @@
// SPLASH SCREEN TEXTS
STRINGTABLE
BEGIN
- IDS_SPLASH_DEVELOPERS "Developers:\nDean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford"
- IDS_SPLASH_GPLTEXT "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU Public License in the Help menu for details."
+ IDS_SPLASH_DEVELOPERS "D\xE9veloppeurs:\nDean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford"
+ IDS_SPLASH_GPLTEXT "WinMerge est fourni SANS AUCUNE GARANTIE. C'est un logiciel libre et vous \xEAtes invit\xE9 \xE0 le redistribuer sous certaines conditions; Voir la license publique GNU au menu d'aide pour tous les d\xE9tails."
END
// "DO NOT SHOW AGAIN" MESSAGEBOXES
@@ -1911,7 +1911,7 @@
IDS_OPTIONSPG_CODEPAGE "Page de code"
IDS_OPTIONSPG_SYNTAXCOLORS "Couleurs de la syntaxe"
IDS_OPTIONSPG_ARCHIVE "Support des archives"
- IDS_OPTIONSPG_TEXTCOLORS "Text Colors"
+ IDS_OPTIONSPG_TEXTCOLORS "Couleurs du texte"
END
// WINMERGE CUSTOM STRINGS
@@ -1925,7 +1925,7 @@
// WINMERGE COMMAND LINE HELP#1
STRINGTABLE
BEGIN
- IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]"
+ IDS_CMDLINE_SYNTAX "Syntaxe : WinMerge [/r] [/e] [/x] [/s]"
IDS_CMDLINE_SYNTAX_ARGS "CheminGauche CheminDroit [CheminSortie]"
IDS_CMDLINE_SYNTAX_ARG_FILTER "masque/filtre"
IDS_CMDLINE_SYNTAX_LEFTDESC "description"
@@ -1939,13 +1939,13 @@
// WINMERGE COMMAND LINE HELP#2
STRINGTABLE
BEGIN
- IDS_CMDLINE_FILEMASK "/f or -f d\xE9fini un masque ou un filtre, de fichier pour comparer"
- IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical"
- IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance"
- IDS_CMDLINE_LEFTPATH "CheminGauche est le r\xE9pertoire ou le fichier \xE0 ouvrir du c\xF4t\xE9 gauche"
- IDS_CMDLINE_RIGHTPATH "CheminDroit est le r\xE9pertoire ou le fichier \xE0 ouvrir du c\xF4t\xE9 droit"
- IDS_CMDLINE_OUTPUTPATH "CheminSortie est un r\xE9pertoire optionel o\xF9 enregistrer les fichiers fusionn\xE9s"
- IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference."
+ IDS_CMDLINE_FILEMASK "/f or -f d\xE9fini un masque ou un filtre, de fichier pour comparer"
+ IDS_CMDLINE_FASTCLOSE "/x or -x ferme WinMerge si le r\xE9sultat est identique"
+ IDS_CMDLINE_SINGLE_INST "/s or -s ouvre les chemins dans l'instance actuelle de WinMerge "
+ IDS_CMDLINE_LEFTPATH "CheminGauche est le r\xE9pertoire ou le fichier \xE0 ouvrir du c\xF4t\xE9 gauche"
+ IDS_CMDLINE_RIGHTPATH "CheminDroit est le r\xE9pertoire ou le fichier \xE0 ouvrir du c\xF4t\xE9 droit"
+ IDS_CMDLINE_OUTPUTPATH "CheminSortie est un r\xE9pertoire optionel o\xF9 enregistrer les fichiers fusionn\xE9s"
+ IDS_CMDLINE_SEEMANUAL "Voir la documentation pour le d\xE9tail de la ligne de commande."
END
// VARIOUS OPTIONS
@@ -1955,8 +1955,8 @@
IDS_MESSAGE_BOX_ARE_RESET "Tous les messages seront r\xE9affich\xE9s."
IDS_DIFF_OPEN_NO_SET_PROPS "Certains fichiers de la session courante ont \xE9t\xE9 modifi\xE9s. Les changements de pr\xE9f\xE9rences seront en vigueur lors de la prochaine comparaison de fichier."
IDS_FONT_CHANGE "Le changement de police sera en vigueur lors de la prochaine comparaison de fichier."
- IDS_OPTIONS_INVALID_TABSIZE
- "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
+ IDS_OPTIONS_INVALID_TABSIZE
+ "Taille d'une tabulation -cette \xE9tendue n'est pas accept\xE9e par WinMerge.\n\nVeuillez utiliser ces valeurs 1 - %1."
END
// BROWSE FILE
@@ -1967,15 +1967,15 @@
IDS_ALLFILES "Tous les fichiers (*.*)|*.*||"
IDS_PROJECTFILES "Fichiers de projet WinMerge (*.WinMerge)|*.WinMerge||"
IDS_PROJECTFILES_EXT "WinMerge"
- IDS_INIFILES "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
+ IDS_INIFILES "Fichiers d'options (*.ini)|*.ini|Tous les fichiers (*.*)|*.*||"
END
// REPORT FILES
STRINGTABLE
BEGIN
- IDS_TEXT_REPORT_FILES "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
- IDS_HTML_REPORT_FILES "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
- IDS_XML_REPORT_FILES "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
+ IDS_TEXT_REPORT_FILES "Fichiers texte (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Tous les fichiers (*.*)|*.*||"
+ IDS_HTML_REPORT_FILES "Fichiers HTML (*.htm,*.html)|*.htm;*.html|Tous les fichiers(*.*)|*.*||"
+ IDS_XML_REPORT_FILES "Fichiers XML (*.xml)|*.xml|All Files (*.*)|*.*||"
END
// COMPARE OPTIONS
@@ -1984,8 +1984,8 @@
IDS_COMPMETHOD_FULL_CONTENTS "Contenu complet"
IDS_COMPMETHOD_QUICK_CONTENTS "Contenu rapide"
IDS_COMPMETHOD_MODDATE "Date de modification"
- IDS_COMPMETHOD_DATESIZE "Modified Date and Size"
- IDS_COMPMETHOD_SIZE "Size"
+ IDS_COMPMETHOD_DATESIZE "Date et taille modifi\xE9e"
+ IDS_COMPMETHOD_SIZE "Taille"
END
// FILTER OPTIONS
@@ -1998,19 +1998,19 @@
IDS_FILTERFILE_DESCTITLE "Description"
IDS_FILEFILTER_SAVENEW "S\xE9lectionner un nom de fichier pour le nouveau filtre"
IDS_FILEFILTER_FILEMASK "Filtres de fichier (*.flt)|*.flt|Tous les fichiers (*.*)|*.*||"
- IDS_FILEFILTER_TMPL_MISSING
- "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder."
- IDS_FILEFILTER_TMPL_COPY
- "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable."
- IDS_FILEFILTER_NO_USERFOLDER
- "User's filter file folder is not defined!\n\nPlease select filter folder in options/System."
- IDS_FILEFILTER_DELETE_FAIL
- "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?"
- IDS_FILEFILTER_INSTALL "Locate filter file to install"
- IDS_FILEFILTER_INSTALLFAIL
- "Installing filter file failed.\n\nCould not copy new filter file to filter folder."
- IDS_FILEFILTER_OVERWRITE
- "Filter file already exists. Overwrite existing filter?"
+ IDS_FILEFILTER_TMPL_MISSING
+ "Ne peut trouver le fichier mod\xE8le de filtre!\n\nVeuillez copier le fichier %1 au r\xE9pertoire de filtre WinMerge."
+ IDS_FILEFILTER_TMPL_COPY
+ "Ne peut copier le fichier mod\xE8le de filtre au r\xE9pertoire de filtre:\n%1\n\nVeuillez vous assurer de l'existance du r\xE9pertore et qu'il soit inscriptible."
+ IDS_FILEFILTER_NO_USERFOLDER
+ "R\xE9pertoire de filtre de l'utilisateur est ind\xE9fini!\n\nVeuillez le d\xE9finir sous Pr\xE9f\xE9rences/Syst\xE8me."
+ IDS_FILEFILTER_DELETE_FAIL
+ "Ne peut d\xE9truire le fichier de filtre:\n%1\n\nCause probable: fichier en lecture seule?"
+ IDS_FILEFILTER_INSTALL "Localiser le fichier de filtre \xE0 installer"
+ IDS_FILEFILTER_INSTALLFAIL
+ "L'installation du fichier de filtre a \xE9cou\xE9e.\n\nNe peut copier le nouveau fichier de filtre au r\xE9pertoire de filtre."
+ IDS_FILEFILTER_OVERWRITE
+ "Le fichier de filtre existe d\xE9j\xE0. \xC9craser le filtre existant?"
END
// VERSION CONTROL OPTIONS
@@ -2060,8 +2060,8 @@
// MORE STATUS PANES
STRINGTABLE
BEGIN
- IDS_DIRVIEW_STATUS_FMT_FOCUS "\xC9l\xE9ment %1 de %2"
- IDS_DIRVIEW_STATUS_FMT_NOFOCUS "\xC9l\xE9ment: %1"
+ IDS_DIRVIEW_STATUS_FMT_FOCUS "\xC9l\xE9ment %1 de %2"
+ IDS_DIRVIEW_STATUS_FMT_NOFOCUS "\xC9l\xE9ment: %1"
END
// OPEN DIALOG
@@ -2096,8 +2096,7 @@
IDS_SAVEREADONLY_FMT "%1 est en lecture seule. Voulez-vous outrepasser ? (Choisissez Non pour enregistrer avec un nouveau nom.)"
IDS_ERROR_FILE_WRITEABLE "Erreur en v\xE9rifiant les droits en \xE9criture de la destination"
IDS_ERROR_BACKUP "Erreur lors du backup du fichier"
- IDS_BACKUP_FAILED_PROMPT
- "Ne peut effectuer le backup du fichier d'origine:\n%1\n\nContinuer quand m\xEAme ?"
+ IDS_BACKUP_FAILED_PROMPT "Ne peut effectuer le backup du fichier d'origine:\n%1\n\nContinuer quand m\xEAme ?"
IDS_FILESAVE_FAILED "Erreur lors de l'enregistrement.\n%1\n%2\nVoulez-vous:\n\t-utiliser un nom autre nom de fichier (Ok)\n\t-avorter l'op\xE9ration en cours (Annuler)?"
IDS_FILEPACK_FAILED_LEFT "Le plugiciel '%2' ne peut compress\xE9 le fichier modifi\xE9 de gauche dans '%1'.\n\nLe fichier original est conserv\xE9.\n\nVoulez-vous enregistrer la version d\xE9compress\xE9e sous un autre nom ?"
IDS_FILEPACK_FAILED_RIGHT "Le plugiciel '%2' ne peut compress\xE9 le fichier modifi\xE9 de droite dans '%1'.\n\nLe fichier original est conserv\xE9.\n\nVoulez-vous enregistrer la version d\xE9compress\xE9e sous un autre nom ?"
@@ -2124,8 +2123,8 @@
IDS_VSSFOLDER_AND_FILE_NOMATCH "Le r\xE9pertoire de travail de VSS et l'emplacement du fichier courant ne correspondent pas. Continuer ?"
IDS_VSS_NODATABASES "Aucune base de donn\xE9es de VSS trouv\xE9e !"
IDS_VSS_ERRORFROM "Erreur de VSS:"
- IDS_VSS_CHECKINERROR "Versioning System returned an error while attempting to check in the file.\n Please, check config spec of used view.\n Undo checkout operation?"
- IDS_VSS_UNCOERROR "Versioning System returned an error while attempting to undo checkout the file.\n Please, check config spec of used view. "
+ IDS_VSS_CHECKINERROR "Le syst\xE8me de contr\xF4le de version a retourn\xE9 une erreur en essayant d'inscrire le fichier.\n Veuillez v\xE9rifier la configuration.\n Annuler l'operation d'extraction?"
+ IDS_VSS_UNCOERROR "Le syst\xE8me de contr\xF4le de version a retourn\xE9 une erreur en essayant d'extraire le fichier.\n Veuillez v\xE9rifier la configuration. "
END
// VSS system
@@ -2142,15 +2141,15 @@
// DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
STRINGTABLE
BEGIN
- ID_DIR_COPY_LEFT_TO_RIGHT "Copy selected item to named directory"
- ID_DIR_COPY_LEFT_TO_BROWSE "Copy selected item to custom directory"
- ID_DIR_COPY_RIGHT_TO_LEFT "Copy selected item to named directory"
- ID_DIR_COPY_RIGHT_TO_BROWSE "Copy selected item to custom directory"
+ ID_DIR_COPY_LEFT_TO_RIGHT "Copier le fichier s\xE9lectionn\xE9 vers le r\xE9pertoire indentifi\xE9"
+ ID_DIR_COPY_LEFT_TO_BROWSE "Copier le fichier s\xE9lectionn\xE9 vers un r\xE9pertoire \xE0 indentifer"
+ ID_DIR_COPY_RIGHT_TO_LEFT "Copier le fichier s\xE9lectionn\xE9 vers le r\xE9pertoire indentifi\xE9"
+ ID_DIR_COPY_RIGHT_TO_BROWSE "Copier le fichier s\xE9lectionn\xE9 vers un r\xE9pertoire \xE0 indentifer"
ID_DIR_DEL_LEFT "Supprimer l'\xE9l\xE9ment s\xE9lectionn\xE9 \xE0 gauche"
ID_DIR_DEL_RIGHT "Supprimer l'\xE9l\xE9ment s\xE9lectionn\xE9 \xE0 droite"
ID_DIR_DEL_BOTH "Supprimer l'\xE9l\xE9ment s\xE9lectionn\xE9 de chaque c\xF4t\xE9"
ID_DIR_HIDE_FILENAMES "Dissimuler l'\xE9l\xE9ment s\xE9lectionn\xE9 (filtre instantan\xE9)"
- ID_DIR_ITEM_RENAME "Rename selected item on both sides"
+ ID_DIR_ITEM_RENAME "Renommer l'\xE9l\xE9ment s\xE9lectionn\xE9 de chaque c\xF4t\xE9"
IDS_COPY_TO_LEFT "De droite \xE0 gauche (%1)"
IDS_COPY_TO_RIGHT "De gauche \xE0 droite (%1)"
IDS_COPY_TO_LEFT2 "De droite \xE0 gauche (%1 de %2)"
@@ -2177,8 +2176,8 @@
IDS_MOVE_RIGHT_TO2 "De droite vers... (%1 de %2)"
IDS_SELECT_DEST_LEFT "C\xF4t\xE9 gauche - choisir r\xE9pertoire de destination:"
IDS_SELECT_DEST_RIGHT "C\xF4t\xE9 droit - choisir r\xE9pertoire de destination:"
- IDS_FILES_AFFECTED_FMT "(%1 Files Affected)"
- IDS_FILES_AFFECTED_FMT2 "(%1 of %2 Files Affected)"
+ IDS_FILES_AFFECTED_FMT "(%1 Fichiers modifi\xE9s)"
+ IDS_FILES_AFFECTED_FMT2 "(%1 de %2 Fichiers modifi\xE9s)"
END
// DIRECTORY DIFFING : FILE COPY/DELETE CONFIRMATION
@@ -2202,8 +2201,8 @@
ID_DIR_OPEN_RIGHT "Ouvrir le fichier de droite"
ID_DIR_OPEN_RIGHT_WITHEDITOR "Ouvrir le fichier de droite avec l'\xE9diteur externe"
ID_DIR_OPEN_RIGHT_WITH "Ouvrir le fichier de droite avec ..."
- IDS_ERROR_EXECUTE_FILE "Failed to execute external editor: %1"
- IDS_UNKNOWN_EXECUTE_FILE "Unknown extension on external editor: %1"
+ IDS_ERROR_EXECUTE_FILE "Lancement de l'\xE9diteur externe a \xE9chou\xE9: %1"
+ IDS_UNKNOWN_EXECUTE_FILE "Extension inconnue pour l'\xE9diteur externe: %1"
ID_DIR_COPY_FILENAMES "Copier les fichiers vers le presse-papiers"
ID_DIR_COPY_PATHNAMES_LEFT "Copier les chemins de gauche vers le presse-papiers"
ID_DIR_COPY_PATHNAMES_RIGHT "Copier les chemins de droite vers le presse-papiers"
@@ -2218,10 +2217,8 @@
ID_DIR_ZIP_RIGHT "Ajouter les \xE9l\xE9ments du c\xF4t\xE9 droit au fichier d'archives"
ID_DIR_ZIP_BOTH "Ajouter les \xE9l\xE9ments des deux c\xF4t\xE9 au fichier d'archives"
ID_DIR_ZIP_BOTH_DIFFS_ONLY "Ajouter les \xE9l\xE9ments distincts des deux c\xF4t\xE9 au fichier d'archives"
- ID_DIR_MOVE_LEFT_TO_BROWSE
- "D\xE9placer le fichier s\xE9lectionn\xE9 de gauche vers un r\xE9pertoire \xE0 indentifer"
- ID_DIR_MOVE_RIGHT_TO_BROWSE
- "D\xE9placer le fichier s\xE9lectionn\xE9 de droite vers un r\xE9pertoire \xE0 indentifer"
+ ID_DIR_MOVE_LEFT_TO_BROWSE "D\xE9placer le fichier s\xE9lectionn\xE9 de gauche vers un r\xE9pertoire \xE0 indentifer"
+ ID_DIR_MOVE_RIGHT_TO_BROWSE "D\xE9placer le fichier s\xE9lectionn\xE9 de droite vers un r\xE9pertoire \xE0 indentifer"
END
// DIRECTORY DIFFING : COLUMN TITLES #1
@@ -2235,8 +2232,8 @@
IDS_COLHDR_EXTENSION "Extension"
IDS_COLHDR_LSIZE "Taille gauche"
IDS_COLHDR_RSIZE "Taille droite"
- IDS_COLHDR_RSIZE_SHORT "Right Size (Short)"
- IDS_COLHDR_LSIZE_SHORT "Left Size (Short)"
+ IDS_COLHDR_RSIZE_SHORT "Taille droite (abr\xE9g\xE9e)"
+ IDS_COLHDR_LSIZE_SHORT "Taille gauche (abr\xE9g\xE9e)"
END
// DIRECTORY DIFFING : COLUMN TITLES #2
@@ -2250,8 +2247,8 @@
IDS_COLHDR_RESULT_ABBR "R\xE9sultat"
IDS_COLHDR_LATTRIBUTES "Attributs gauches"
IDS_COLHDR_RATTRIBUTES "Attributs droits"
- IDS_COLHDR_LEOL_TYPE "Left EOL"
- IDS_COLHDR_REOL_TYPE "Right EOL"
+ IDS_COLHDR_LEOL_TYPE "Fin de ligne gauche"
+ IDS_COLHDR_REOL_TYPE "Fin de ligne droit"
END
// DIRECTORY DIFFING : COLUMN TITLES #3
@@ -2259,8 +2256,8 @@
BEGIN
IDS_COLHDR_LENCODING "Page de code gauche"
IDS_COLHDR_RENCODING "Page de code droite"
- IDS_COLHDR_NIDIFFS "Ignored Diff."
- IDS_COLHDR_NSDIFFS "Differences"
+ IDS_COLHDR_NIDIFFS "Diff\xE9rences ignor\xE9es."
+ IDS_COLHDR_NSDIFFS "Diff\xE9rences"
IDS_COLHDR_BINARY "Binaire"
END
@@ -2268,7 +2265,7 @@
STRINGTABLE
BEGIN
IDS_CANT_COMPARE_FILES "Impossible de comparer les fichiers"
- IDS_ABORTED_ITEM "Item aborted"
+ IDS_ABORTED_ITEM "\xC9l\xE9ment abandonn\xE9"
IDS_FILE_SKIPPED "Fichier ignor\xE9"
IDS_DIR_SKIPPED "R\xE9pertoire ignor\xE9"
IDS_ONLY_IN_FMT "Uniquement dans %1"
@@ -2300,8 +2297,8 @@
IDS_COLDESC_EXTENSION "Extension du fichier."
IDS_COLDESC_LSIZE "Taille du fichier du c\xF4t\xE9 gauche en octets."
IDS_COLDESC_RSIZE "Taille du fichier du c\xF4...
[truncated message content] |
|
From: <ki...@us...> - 2007-03-01 17:35:31
|
Revision: 4139
http://svn.sourceforge.net/winmerge/?rev=4139&view=rev
Author: kimmov
Date: 2007-03-01 09:35:20 -0800 (Thu, 01 Mar 2007)
Log Message:
-----------
PATCH: [ 1664689 ] French translation (Update)
- Submitted by Jean-F Jolin
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Languages/French/MergeFrench.rc
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-02-27 17:17:15 UTC (rev 4138)
+++ branches/R2_6/Src/Changes.txt 2007-03-01 17:35:20 UTC (rev 4139)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-01 Kimmo
+ PATCH: [ 1664689 ] French translation (Update)
+ Submitted by Jean-F Jolin
+ Src/Languages/French: MergeFrench.rc
+
2007-02-27 Kimmo
PATCH: [ 1664689 ] French translation
Submitted by Jean-F Jolin
Modified: branches/R2_6/Src/Languages/French/MergeFrench.rc
===================================================================
--- branches/R2_6/Src/Languages/French/MergeFrench.rc 2007-02-27 17:17:15 UTC (rev 4138)
+++ branches/R2_6/Src/Languages/French/MergeFrench.rc 2007-03-01 17:35:20 UTC (rev 4139)
@@ -376,7 +376,7 @@
END
POPUP "&Signets"
BEGIN
- MENUITEM "&Activer les signets\tCtrl+F2", ID_EDIT_TOGGLE_BOOKMARK
+ MENUITEM "&Placer/retirer un signet\tCtrl+F2", ID_EDIT_TOGGLE_BOOKMARK
MENUITEM "Signet &suivant\tF2", ID_EDIT_GOTO_NEXT_BOOKMARK
MENUITEM "Signet &pr\xE9c\xE9dent\tShift+F2", ID_EDIT_GOTO_PREV_BOOKMARK
MENUITEM "&Effacer tous les signets", ID_EDIT_CLEAR_ALL_BOOKMARKS
@@ -854,7 +854,7 @@
ES_AUTOHSCROLL | ES_WANTRETURN
END
-IDD_PROPPAGE_COLORS DIALOGEX 0, 0, 235, 196
+IDD_PROPPAGE_COLORS_WINMERGE DIALOGEX 0, 0, 235, 196
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
CAPTION "Couleurs"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -1034,8 +1034,8 @@
GROUPBOX "Montrer les colonnes",IDC_GROUP_SHOW,7,7,145,102
LISTBOX IDC_LIST_SHOW,52,18,92,83,LBS_NOINTEGRALHEIGHT |
LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
- PUSHBUTTON "&Monter",IDC_UP,15,45,30,14
- PUSHBUTTON "&Descendre",IDC_DOWN,15,63,30,14
+ PUSHBUTTON "&Monter",IDC_UP,10,45,40,14
+ PUSHBUTTON "&Descendre",IDC_DOWN,10,63,40,14
GROUPBOX "Cacher les colonnes",IDC_GROUP_HIDE,193,7,108,102
LISTBOX IDC_LIST_HIDE,201,18,92,83,LBS_NOINTEGRALHEIGHT |
LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
@@ -1160,7 +1160,7 @@
CONTROL "Ins\xE9rer &espace",IDC_PROP_INSERT_SPACES,"Button",
BS_AUTORADIOBUTTON,120,62,97,10
GROUPBOX "Colorer les diff\xE9rences de ligne",IDC_LINE_COLORING_GROUP,7,87,
- 221,41
+ 221,61
CONTROL "A&fficher les diff\xE9rences",IDC_VIEW_LINE_DIFFERENCES,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,14,98,100,8
CONTROL "Pr\xE9cision au &caract\xE8re",IDC_EDITOR_CHARLEVEL,"Button",
@@ -1285,7 +1285,7 @@
WS_HSCROLL | WS_GROUP | WS_TABSTOP
END
-IDD_PREFERENCES DIALOGEX 0, 0, 367, 260
+IDD_PREFERENCES DIALOGEX 0, 0, 352, 260
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
CAPTION "Pr\xE9f\xE9rences"
@@ -1305,7 +1305,7 @@
PUSHBUTTON "Exporter...",IDC_TREEOPT_EXPORT,62,237,50,14
END
-IDD_PROP_COLORSYNTAX DIALOGEX 0, 0, 235, 214
+IDD_PROPPAGE_COLORS_SYNTAX DIALOGEX 0, 0, 235, 214
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
CAPTION "Couleurs de la syntaxe"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -2781,7 +2781,7 @@
ID_REFRESH "Actualiser l'affichage\nActualiser (F5)"
ID_EDIT_COPY_LINENUMBERS "Copier les lignes s\xE9lectionn\xE9s vers le presse-papiers en les pr\xE9c\xE9dants d'un num\xE9ro de ligne"
ID_DIR_RESCAN "Actualiser les \xE9l\xE9ments s\xE9lectionn\xE9s"
- ID_EDIT_TOGGLE_BOOKMARK "Afficher ou masquer les signets"
+ ID_EDIT_TOGGLE_BOOKMARK "Placer ou retirer un signet"
ID_EDIT_GOTO_NEXT_BOOKMARK "Atteindre le signet suivant"
ID_EDIT_GOTO_PREV_BOOKMARK "Atteindre le signet pr\xE9c\xE9dent"
ID_EDIT_CLEAR_ALL_BOOKMARKS "Effacer tous les signets"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-03-04 14:33:53
|
Revision: 4142
http://svn.sourceforge.net/winmerge/?rev=4142&view=rev
Author: gerundt
Date: 2007-03-04 06:33:52 -0800 (Sun, 04 Mar 2007)
Log Message:
-----------
BUG: [ 1668996 ] Two "Copy Right" buttons in Russian GUI.
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Languages/Russian/MergeRussian.rc
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-03-04 14:33:14 UTC (rev 4141)
+++ branches/R2_6/Src/Changes.txt 2007-03-04 14:33:52 UTC (rev 4142)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-04 Tim
+ BUG: [ 1668996 ] Two "Copy Right" buttons in Russian GUI.
+ Src/Languages/Russian: MergeRussian.rc
+
2007-03-01 Kimmo
PATCH: [ 1664689 ] French translation (Update)
Submitted by Jean-F Jolin
Modified: branches/R2_6/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- branches/R2_6/Src/Languages/Russian/MergeRussian.rc 2007-03-04 14:33:14 UTC (rev 4141)
+++ branches/R2_6/Src/Languages/Russian/MergeRussian.rc 2007-03-04 14:33:52 UTC (rev 4142)
@@ -2826,7 +2826,7 @@
ID_CURDIFF "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xED\xE0 \xF2\xE5\xEA\xF3\xF9\xE5\xE5 \xEE\xF2\xEB\xE8\xF7\xE8\xE5\nCurrent Diff (Alt+Enter)"
ID_LASTDIFF "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xED\xE0 \xEF\xEE\xF1\xEB\xE5\xE4\xED\xE5\xE5 \xEE\xF2\xEB\xE8\xF7\xE8\xE5\nLast Diff (Alt+End)"
ID_L2R "\xD1\xEA\xEE\xEF\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xE2\xFB\xE1\xF0\xE0\xED\xED\xFB\xE9 \xF2\xE5\xEA\xF1\xF2 \xE2 \xF4\xE0\xE9\xEB \xF1\xEF\xF0\xE0\xE2\xE0\nCopy Right (Alt Right)"
- ID_R2L "\xD1\xEA\xEE\xEF\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xE2\xFB\xE1\xF0\xE0\xED\xED\xFB\xE9 \xF2\xE5\xEA\xF1\xF2 \xE2 \xF4\xE0\xE9\xEB \xF1\xEB\xE5\xE2\xE0\nCopy Right (Alt Right)"
+ ID_R2L "\xD1\xEA\xEE\xEF\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xE2\xFB\xE1\xF0\xE0\xED\xED\xFB\xE9 \xF2\xE5\xEA\xF1\xF2 \xE2 \xF4\xE0\xE9\xEB \xF1\xEB\xE5\xE2\xE0\nCopy Left (Alt Left)"
ID_L2RNEXT "\xD1\xEA\xEE\xEF\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xEE\xF2\xEB\xE8\xF7\xE8\xE5 \xED\xE0 \xEB\xE5\xE2\xF3\xFE \xEF\xE0\xED\xE5\xEB\xFC \xE8 \xEF\xE5\xF0\xE5\xE9\xF2\xE8 \xEA \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE5\xEC\xF3\nCopy Right and advance (Ctrl Alt Right)"
ID_R2LNEXT "\xD1\xEA\xEE\xEF\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xEE\xF2\xEB\xE8\xF7\xE8\xE5 \xED\xE0 \xEF\xF0\xE0\xE2\xF3\xFE \xEF\xE0\xED\xE5\xEB\xFC \xE8 \xEF\xE5\xF0\xE5\xE9\xF2\xE8 \xEA \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE5\xEC\xF3\nCopy Left and advance (Ctrl Alt Left)"
ID_ALL_RIGHT "\xD1\xEA\xEE\xEF\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xE2\xF1\xE5 \xEE\xF2\xEB\xE8\xF7\xE8\xFF \xE2 \xF4\xE0\xE9\xEB \xF1\xEF\xF0\xE0\xE2\xE0\nAll Right"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2007-03-07 20:10:24
|
Revision: 4148
http://svn.sourceforge.net/winmerge/?rev=4148&view=rev
Author: sdottaka
Date: 2007-03-07 12:10:21 -0800 (Wed, 07 Mar 2007)
Log Message:
-----------
PATCH: [ 1675211 ] Fix crash when hiding parent folder item on folder view
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/DirView.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-03-07 20:09:46 UTC (rev 4147)
+++ branches/R2_6/Src/Changes.txt 2007-03-07 20:10:21 UTC (rev 4148)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-07 Takashi
+ PATCH: [ 1675211 ] Fix crash when hiding parent folder item on folder view
+ Src/DirView.cpp
+
2007-03-04 Kimmo
BUG: [ 1664832 ] Typo Error in the Registry
ShellExtension: WinMergeShell.rgs
Modified: branches/R2_6/Src/DirView.cpp
===================================================================
--- branches/R2_6/Src/DirView.cpp 2007-03-07 20:09:46 UTC (rev 4147)
+++ branches/R2_6/Src/DirView.cpp 2007-03-07 20:10:21 UTC (rev 4148)
@@ -2702,6 +2702,8 @@
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
POSITION pos = GetItemKey(sel);
+ if (pos == (POSITION) SPECIAL_ITEM_POS)
+ continue;
pDoc->SetItemViewFlag(pos, ViewCustomFlags::HIDDEN, ViewCustomFlags::VISIBILITY);
m_pList->DeleteItem(sel--);
m_nHiddenItems++;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-03-11 21:05:06
|
Revision: 4156
http://svn.sourceforge.net/winmerge/?rev=4156&view=rev
Author: gerundt
Date: 2007-03-11 14:05:02 -0700 (Sun, 11 Mar 2007)
Log Message:
-----------
PATCH: [ 1582537 ] CSS syntax highlighter
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Merge.dsp
branches/R2_6/Src/editlib/ccrystaltextview.cpp
branches/R2_6/Src/editlib/ccrystaltextview.h
Added Paths:
-----------
branches/R2_6/Src/editlib/css.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-03-11 15:23:48 UTC (rev 4155)
+++ branches/R2_6/Src/Changes.txt 2007-03-11 21:05:02 UTC (rev 4156)
@@ -2,6 +2,12 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-11 Tim
+ PATCH: [ 1582537 ] CSS syntax highlighter
+ Src: Merge.dsp
+ editlib: ccrystaltextview.cpp ccrystaltextview.h
+ editlib new file: css.cpp
+
2007-03-07 Takashi
PATCH: [ 1675211 ] Fix crash when hiding parent folder item on folder view
Src/DirView.cpp
Modified: branches/R2_6/Src/Merge.dsp
===================================================================
--- branches/R2_6/Src/Merge.dsp 2007-03-11 15:23:48 UTC (rev 4155)
+++ branches/R2_6/Src/Merge.dsp 2007-03-11 21:05:02 UTC (rev 4156)
@@ -1805,6 +1805,10 @@
# End Source File
# Begin Source File
+SOURCE=.\editlib\css.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\editlib\dcl.cpp
# End Source File
# Begin Source File
Modified: branches/R2_6/Src/editlib/ccrystaltextview.cpp
===================================================================
--- branches/R2_6/Src/editlib/ccrystaltextview.cpp 2007-03-11 15:23:48 UTC (rev 4155)
+++ branches/R2_6/Src/editlib/ccrystaltextview.cpp 2007-03-11 21:05:02 UTC (rev 4156)
@@ -260,6 +260,7 @@
CCrystalTextView::SRC_BATCH, _T ("Batch"), _T ("bat,btm,cmd"), &CCrystalTextView::ParseLineBatch, SRCOPT_INSERTTABS|SRCOPT_AUTOINDENT, /*4,*/ _T (""), _T (""), _T ("rem "), (DWORD)-1,
CCrystalTextView::SRC_C, _T ("C"), _T ("c,cc,cpp,cxx,h,hpp,hxx,hm,inl,rh,tlh,tli,xs"), &CCrystalTextView::ParseLineC, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T ("/*"), _T ("*/"), _T ("//"), (DWORD)-1,
CCrystalTextView::SRC_CSHARP, _T ("C#"), _T ("cs"), &CCrystalTextView::ParseLineCSharp, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T ("/*"), _T ("*/"), _T ("//"), (DWORD)-1,
+ CCrystalTextView::SRC_CSS, _T ("CSS"), _T ("css"), &CCrystalTextView::ParseLineCss, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T ("/*"), _T ("*/"), _T (""), (DWORD)-1,
CCrystalTextView::SRC_DCL, _T ("DCL"), _T ("dcl,dcc"), &CCrystalTextView::ParseLineDcl, SRCOPT_AUTOINDENT|SRCOPT_BRACEGNU, /*2,*/ _T ("/*"), _T ("*/"), _T ("//"), (DWORD)-1,
CCrystalTextView::SRC_FORTRAN, _T ("Fortran"), _T ("f,f90,f9p,fpp,for,f77"), &CCrystalTextView::ParseLineFortran, SRCOPT_INSERTTABS|SRCOPT_AUTOINDENT, /*8,*/ _T (""), _T (""), _T ("!"), (DWORD)-1,
CCrystalTextView::SRC_HTML, _T ("HTML"), _T ("html,htm,shtml,ihtml,ssi,stm,stml,jsp"), &CCrystalTextView::ParseLineHtml, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T ("<!--"), _T ("-->"), _T (""), (DWORD)-1,
Modified: branches/R2_6/Src/editlib/ccrystaltextview.h
===================================================================
--- branches/R2_6/Src/editlib/ccrystaltextview.h 2007-03-11 15:23:48 UTC (rev 4155)
+++ branches/R2_6/Src/editlib/ccrystaltextview.h 2007-03-11 21:05:02 UTC (rev 4156)
@@ -629,6 +629,7 @@
DWORD ParseLineBatch (DWORD dwCookie, int nLineIndex, TEXTBLOCK * pBuf, int &nActualItems);
DWORD ParseLineC (DWORD dwCookie, int nLineIndex, TEXTBLOCK * pBuf, int &nActualItems);
DWORD ParseLineCSharp (DWORD dwCookie, int nLineIndex, TEXTBLOCK * pBuf, int &nActualItems);
+ DWORD ParseLineCss (DWORD dwCookie, int nLineIndex, TEXTBLOCK * pBuf, int &nActualItems);
DWORD ParseLineDcl (DWORD dwCookie, int nLineIndex, TEXTBLOCK * pBuf, int &nActualItems);
DWORD ParseLineFortran (DWORD dwCookie, int nLineIndex, TEXTBLOCK * pBuf, int &nActualItems);
DWORD ParseLineHtml (DWORD dwCookie, int nLineIndex, TEXTBLOCK * pBuf, int &nActualItems);
@@ -707,6 +708,7 @@
SRC_BATCH,
SRC_C,
SRC_CSHARP,
+ SRC_CSS,
SRC_DCL,
SRC_FORTRAN,
SRC_HTML,
Added: branches/R2_6/Src/editlib/css.cpp
===================================================================
--- branches/R2_6/Src/editlib/css.cpp (rev 0)
+++ branches/R2_6/Src/editlib/css.cpp 2007-03-11 21:05:02 UTC (rev 4156)
@@ -0,0 +1,391 @@
+///////////////////////////////////////////////////////////////////////////
+// File: css.cpp
+// Version: 1.0
+// Created: 22-Oct-2006
+//
+// Copyright: Stcherbatchenko Andrei, portions by Tim Gerundt
+// E-mail: win...@gm...
+//
+// CSS (Cascading Stylesheets) syntax highlighing definition
+//
+// You are free to use or modify this code to the following restrictions:
+// - Acknowledge me somewhere in your about box, simple "Parts of code by.."
+// will be enough. If you can't (or don't want to), contact me personally.
+// - LEAVE THIS HEADER INTACT
+////////////////////////////////////////////////////////////////////////////
+
+#include "stdafx.h"
+#include "ccrystaltextview.h"
+#include "ccrystaltextbuffer.h"
+#include "SyntaxColors.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+static LPTSTR s_apszCss1KeywordList[] =
+ {
+ // CSS 1
+ _T ("background"),
+ _T ("background-attachment"),
+ _T ("background-color"),
+ _T ("background-image"),
+ _T ("background-position"),
+ _T ("background-repeat"),
+ _T ("border"),
+ _T ("border-bottom"),
+ _T ("border-bottom-width"),
+ _T ("border-color"),
+ _T ("border-left"),
+ _T ("border-left-width"),
+ _T ("border-right"),
+ _T ("border-right-width"),
+ _T ("border-style"),
+ _T ("border-top"),
+ _T ("border-top-width"),
+ _T ("border-width"),
+ _T ("clear"),
+ _T ("color"),
+ _T ("display"),
+ _T ("float"),
+ _T ("font"),
+ _T ("font-family"),
+ _T ("font-size"),
+ _T ("font-style"),
+ _T ("font-variant"),
+ _T ("font-weight"),
+ _T ("height"),
+ _T ("letter-spacing"),
+ _T ("line-height"),
+ _T ("list-style"),
+ _T ("list-style-image"),
+ _T ("list-style-position"),
+ _T ("list-style-type"),
+ _T ("margin"),
+ _T ("margin-bottom"),
+ _T ("margin-left"),
+ _T ("margin-right"),
+ _T ("margin-top"),
+ _T ("padding"),
+ _T ("padding-bottom"),
+ _T ("padding-left"),
+ _T ("padding-right"),
+ _T ("padding-top"),
+ _T ("text-align"),
+ _T ("text-decoration"),
+ _T ("text-indent"),
+ _T ("text-transform"),
+ _T ("vertical-align"),
+ _T ("white-space"),
+ _T ("width"),
+ _T ("word-spacing"),
+ NULL
+ };
+
+static LPTSTR s_apszCss2KeywordList[] =
+ {
+ // CSS 2
+ _T ("ascent"),
+ _T ("azimuth"),
+ _T ("baseline"),
+ _T ("bbox"),
+ _T ("border-bottom-color"),
+ _T ("border-bottom-style"),
+ _T ("border-collapse"),
+ _T ("border-color"),
+ _T ("border-left-color"),
+ _T ("border-left-style"),
+ _T ("border-right-color"),
+ _T ("border-right-style"),
+ _T ("border-spacing"),
+ _T ("border-style"),
+ _T ("border-top-color"),
+ _T ("border-top-style"),
+ _T ("bottom"),
+ _T ("cap-height"),
+ _T ("caption-side"),
+ _T ("centerline"),
+ _T ("clip"),
+ _T ("content"),
+ _T ("counter-increment"),
+ _T ("counter-reset"),
+ _T ("cue"),
+ _T ("cue-after"),
+ _T ("cue-before"),
+ _T ("cursor"),
+ _T ("definition-src"),
+ _T ("descent"),
+ _T ("direction"),
+ _T ("elevation"),
+ _T ("empty-cells"),
+ _T ("font-size-adjust"),
+ _T ("font-stretch"),
+ _T ("left"),
+ _T ("marker-offset"),
+ _T ("marks"),
+ _T ("mathline"),
+ _T ("max-height"),
+ _T ("max-width"),
+ _T ("min-height"),
+ _T ("min-width"),
+ _T ("orphans"),
+ _T ("outline"),
+ _T ("outline-color"),
+ _T ("outline-style"),
+ _T ("outline-width"),
+ _T ("overflow"),
+ _T ("page"),
+ _T ("page-break-after"),
+ _T ("page-break-before"),
+ _T ("page-break-inside"),
+ _T ("panose-1"),
+ _T ("pause"),
+ _T ("pause-after"),
+ _T ("pause-before"),
+ _T ("pitch"),
+ _T ("pitch-range"),
+ _T ("play-during"),
+ _T ("position"),
+ _T ("quotes"),
+ _T ("richness"),
+ _T ("right"),
+ _T ("size"),
+ _T ("slope"),
+ _T ("speak"),
+ _T ("speak-header"),
+ _T ("speak-numeral"),
+ _T ("speak-punctuation"),
+ _T ("speech-rate"),
+ _T ("src"),
+ _T ("stemh"),
+ _T ("stemv"),
+ _T ("stress"),
+ _T ("table-layout"),
+ _T ("text-shadow"),
+ _T ("top"),
+ _T ("topline"),
+ _T ("unicode-bidi"),
+ _T ("unicode-range"),
+ _T ("units-per-em"),
+ _T ("visibility"),
+ _T ("voice-family"),
+ _T ("volume"),
+ _T ("widows"),
+ _T ("widths"),
+ _T ("x-height"),
+ _T ("z-index"),
+ NULL
+ };
+
+static BOOL
+IsXKeyword (LPTSTR apszKeywords[], LPCTSTR pszChars, int nLength)
+{
+ for (int L = 0; apszKeywords[L] != NULL; L++)
+ {
+ if (_tcsnicmp (apszKeywords[L], pszChars, nLength) == 0
+ && apszKeywords[L][nLength] == 0)
+ return TRUE;
+ }
+ return FALSE;
+}
+
+static BOOL
+IsCss1Keyword (LPCTSTR pszChars, int nLength)
+{
+ return IsXKeyword (s_apszCss1KeywordList, pszChars, nLength);
+}
+
+static BOOL
+IsCss2Keyword (LPCTSTR pszChars, int nLength)
+{
+ return IsXKeyword (s_apszCss2KeywordList, pszChars, nLength);
+}
+
+#define DEFINE_BLOCK(pos, colorindex) \
+ASSERT((pos) >= 0 && (pos) <= nLength);\
+if (pBuf != NULL)\
+ {\
+ if (nActualItems == 0 || pBuf[nActualItems - 1].m_nCharPos <= (pos)){\
+ pBuf[nActualItems].m_nCharPos = (pos);\
+ pBuf[nActualItems].m_nColorIndex = (colorindex);\
+ pBuf[nActualItems].m_nBgColorIndex = COLORINDEX_BKGND;\
+ nActualItems ++;}\
+ }
+
+#define COOKIE_COMMENT 0x0001
+#define COOKIE_PREPROCESSOR 0x0002
+#define COOKIE_EXT_COMMENT 0x0004
+#define COOKIE_STRING 0x0008
+#define COOKIE_CHAR 0x0010
+#define COOKIE_EXT_DEFINITION 0x0020
+#define COOKIE_EXT_VALUE 0x0040
+
+DWORD CCrystalTextView::
+ParseLineCss (DWORD dwCookie, int nLineIndex, TEXTBLOCK * pBuf, int &nActualItems)
+{
+ int nLength = GetLineLength (nLineIndex);
+ if (nLength == 0)
+ return dwCookie & (COOKIE_EXT_COMMENT|COOKIE_EXT_DEFINITION|COOKIE_EXT_VALUE);
+
+ LPCTSTR pszChars = GetLineChars (nLineIndex);
+ BOOL bFirstChar = (dwCookie & ~(COOKIE_EXT_COMMENT|COOKIE_EXT_DEFINITION|COOKIE_EXT_VALUE)) == 0;
+ BOOL bRedefineBlock = TRUE;
+ BOOL bWasCommentStart = FALSE;
+ BOOL bDecIndex = FALSE;
+ int nIdentBegin = -1;
+ int nPrevI = -1;
+ int I=0;
+ for (I = 0;; nPrevI = I, I = CharNext(pszChars+I) - pszChars)
+ {
+ if (I == nPrevI)
+ {
+ // CharNext did not advance, so we're at the end of the string
+ // and we already handled this character, so stop
+ break;
+ }
+
+ if (bRedefineBlock)
+ {
+ int nPos = I;
+ if (bDecIndex)
+ nPos = nPrevI;
+ if (dwCookie & COOKIE_EXT_COMMENT)
+ {
+ DEFINE_BLOCK (nPos, COLORINDEX_COMMENT);
+ }
+ else
+ {
+ if (xisalnum (pszChars[nPos]) || pszChars[nPos] == '.' || pszChars[nPos] == '-' || pszChars[nPos] == '%')
+ {
+ if (dwCookie & COOKIE_EXT_VALUE)
+ {
+ DEFINE_BLOCK (nPos, COLORINDEX_STRING);
+ }
+ else
+ {
+ DEFINE_BLOCK (nPos, COLORINDEX_NORMALTEXT);
+ }
+ }
+ else
+ {
+ DEFINE_BLOCK (nPos, COLORINDEX_OPERATOR);
+ bRedefineBlock = TRUE;
+ bDecIndex = TRUE;
+ goto out;
+ }
+ }
+ bRedefineBlock = FALSE;
+ bDecIndex = FALSE;
+ }
+out:
+
+ // Can be bigger than length if there is binary data
+ // See bug #1474782 Crash when comparing SQL with with binary data
+ if (I >= nLength)
+ break;
+
+ // Extended definition {....}
+ if (dwCookie & COOKIE_EXT_DEFINITION)
+ {
+ if (pszChars[I] == ':') //Value start...
+ {
+ dwCookie |= COOKIE_EXT_VALUE;
+ }
+ else if (pszChars[I] == ';') //Value end...
+ {
+ dwCookie &= ~COOKIE_EXT_VALUE;
+ }
+ else if (pszChars[I] == '}') //Definition end...
+ {
+ dwCookie &= ~COOKIE_EXT_DEFINITION;
+ dwCookie &= ~COOKIE_EXT_VALUE;
+ }
+ }
+
+ // Extended comment /*....*/
+ if (dwCookie & COOKIE_EXT_COMMENT)
+ {
+ if ((I > 1 && pszChars[I] == '/' && pszChars[nPrevI] == '*' && !bWasCommentStart) || (I == 1 && pszChars[I] == '/' && pszChars[nPrevI] == '*'))
+ {
+ dwCookie &= ~COOKIE_EXT_COMMENT;
+ bRedefineBlock = TRUE;
+ }
+ bWasCommentStart = FALSE;
+ continue;
+ }
+
+ // Normal text
+ if (pszChars[I] == '{')
+ {
+ dwCookie |= COOKIE_EXT_DEFINITION;
+ }
+ if (I > 0 && pszChars[I] == '*' && pszChars[nPrevI] == '/')
+ {
+ DEFINE_BLOCK (nPrevI, COLORINDEX_COMMENT);
+ dwCookie |= COOKIE_EXT_COMMENT;
+ bWasCommentStart = TRUE;
+ continue;
+ }
+
+ bWasCommentStart = FALSE;
+
+ if (bFirstChar)
+ {
+ if (!xisspace (pszChars[I]))
+ bFirstChar = FALSE;
+ }
+
+ if (pBuf == NULL)
+ continue; // We don't need to extract keywords,
+ // for faster parsing skip the rest of loop
+
+ if (xisalnum (pszChars[I]) || pszChars[I] == '.' || pszChars[I] == '-' || pszChars[I] == '%')
+ {
+ if (nIdentBegin == -1)
+ nIdentBegin = I;
+ }
+ else
+ {
+ if (nIdentBegin >= 0)
+ {
+ if (dwCookie & COOKIE_EXT_VALUE)
+ {
+ if (IsCss1Keyword (pszChars + nIdentBegin, I - nIdentBegin))
+ {
+ DEFINE_BLOCK (nIdentBegin, COLORINDEX_USER1);
+ }
+ else if (IsCss2Keyword (pszChars + nIdentBegin, I - nIdentBegin))
+ {
+ DEFINE_BLOCK (nIdentBegin, COLORINDEX_USER2);
+ }
+ else
+ {
+ goto next;
+ }
+ }
+ bRedefineBlock = TRUE;
+ bDecIndex = TRUE;
+ nIdentBegin = -1;
+next:
+ ;
+ }
+ }
+ }
+
+ if ((nIdentBegin >= 0) && (dwCookie & COOKIE_EXT_VALUE))
+ {
+ if (IsCss1Keyword (pszChars + nIdentBegin, I - nIdentBegin))
+ {
+ DEFINE_BLOCK (nIdentBegin, COLORINDEX_USER1);
+ }
+ else if (IsCss2Keyword (pszChars + nIdentBegin, I - nIdentBegin))
+ {
+ DEFINE_BLOCK (nIdentBegin, COLORINDEX_USER2);
+ }
+ }
+
+ dwCookie &= (COOKIE_EXT_COMMENT|COOKIE_EXT_DEFINITION|COOKIE_EXT_VALUE);
+ return dwCookie;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-03-19 18:54:47
|
Revision: 4173
http://svn.sourceforge.net/winmerge/?rev=4173&view=rev
Author: kimmov
Date: 2007-03-19 11:32:27 -0700 (Mon, 19 Mar 2007)
Log Message:
-----------
PATCH: [ 1659183 ] Add Vista security attributes to manifest files
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/res/WinMerge.exe.manifest
branches/R2_6/Src/res/WinMergeU.exe.manifest
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-03-18 21:14:29 UTC (rev 4172)
+++ branches/R2_6/Src/Changes.txt 2007-03-19 18:32:27 UTC (rev 4173)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-19 Kimmo
+ PATCH: [ 1659183 ] Add Vista security attributes to manifest files
+ Src/res: WinMerge.exe.manifest WinMergeU.exe.manifest
+
2007-03-11 Tim
PATCH: [ 1582537 ] CSS syntax highlighter
Src: Merge.dsp
Modified: branches/R2_6/Src/res/WinMerge.exe.manifest
===================================================================
--- branches/R2_6/Src/res/WinMerge.exe.manifest 2007-03-18 21:14:29 UTC (rev 4172)
+++ branches/R2_6/Src/res/WinMerge.exe.manifest 2007-03-19 18:32:27 UTC (rev 4173)
@@ -7,6 +7,18 @@
type="win32"
/>
<description>WinMerge Application</description>
+
+ <!-- Identify the application security requirements. -->
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel
+ level="asInvoker"
+ uiAccess="false"/>
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+
<dependency>
<dependentAssembly>
<assemblyIdentity
Modified: branches/R2_6/Src/res/WinMergeU.exe.manifest
===================================================================
--- branches/R2_6/Src/res/WinMergeU.exe.manifest 2007-03-18 21:14:29 UTC (rev 4172)
+++ branches/R2_6/Src/res/WinMergeU.exe.manifest 2007-03-19 18:32:27 UTC (rev 4173)
@@ -7,6 +7,18 @@
type="win32"
/>
<description>WinMerge Application</description>
+
+ <!-- Identify the application security requirements. -->
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel
+ level="asInvoker"
+ uiAccess="false"/>
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+
<dependency>
<dependentAssembly>
<assemblyIdentity
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2007-05-13 01:21:00
|
Revision: 4280
http://svn.sourceforge.net/winmerge/?rev=4280&view=rev
Author: sdottaka
Date: 2007-05-12 18:20:53 -0700 (Sat, 12 May 2007)
Log Message:
-----------
BUG: [ 1717814 ] Fix header drawing issue on WinXP with Luna Theme
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Common/SortHeaderCtrl.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-05-13 01:19:50 UTC (rev 4279)
+++ branches/R2_6/Src/Changes.txt 2007-05-13 01:20:53 UTC (rev 4280)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-05-13 Takashi
+ BUG: [ 1717814 ] Fix header drawing issue on WinXP with Luna Theme
+ Src/Common/SortHeaderCtrl.cpp
+
2007-04-29 Kimmo
PATCH: [ 1704904 ] Korean Translation 2.6.X
Submitted by Sukjoon, Hwang
Modified: branches/R2_6/Src/Common/SortHeaderCtrl.cpp
===================================================================
--- branches/R2_6/Src/Common/SortHeaderCtrl.cpp 2007-05-13 01:19:50 UTC (rev 4279)
+++ branches/R2_6/Src/Common/SortHeaderCtrl.cpp 2007-05-13 01:20:53 UTC (rev 4280)
@@ -9,7 +9,13 @@
#include "stdafx.h"
#include "SortHeaderCtrl.h"
+#include "dllver.h"
+#ifndef HDF_SORTUP
+#define HDF_SORTUP 0x0400
+#define HDF_SORTDOWN 0x0200
+#endif
+
/////////////////////////////////////////////////////////////////////////////
// CSortHeaderCtrl
@@ -37,12 +43,34 @@
m_nSortCol = nCol;
m_bSortAsc = bAsc;
- // Change the item to ownder drawn
HD_ITEM hditem;
hditem.mask = HDI_FORMAT;
+
+ // Clear HDF_SORTDOWN and HDF_SORTUP flag in all columns.
+ int i;
+ for (i = 0; i < this->GetItemCount(); i++)
+ {
+ GetItem( i, &hditem );
+ if (hditem.fmt & (HDF_SORTDOWN | HDF_SORTUP))
+ {
+ hditem.fmt &= ~(HDF_SORTUP | HDF_SORTDOWN);
+ SetItem( i, &hditem );
+ }
+ }
+
GetItem( nCol, &hditem );
- hditem.fmt |= HDF_OWNERDRAW;
+ if (GetDllVersion(_T("comctl32.dll")) >= PACKVERSION(6,00))
+ {
+ // We can use HDF_SORTUP and HDF_SORTDOWN flag to draw a sort arrow on the header.
+ hditem.fmt &= ~(HDF_SORTUP | HDF_SORTDOWN);
+ hditem.fmt |= bAsc ? HDF_SORTUP : HDF_SORTDOWN;
+ }
+ else
+ {
+ // Change the item to owner drawn
+ hditem.fmt |= HDF_OWNERDRAW;
+ }
SetItem( nCol, &hditem );
// Invalidate header control so that it gets redrawn
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-05-19 12:39:17
|
Revision: 4291
http://svn.sourceforge.net/winmerge/?rev=4291&view=rev
Author: gerundt
Date: 2007-05-19 05:39:14 -0700 (Sat, 19 May 2007)
Log Message:
-----------
Fix white space indenting in C# highlighter (included with PATCH #1556685).
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/editlib/csharp.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-05-19 12:37:53 UTC (rev 4290)
+++ branches/R2_6/Src/Changes.txt 2007-05-19 12:39:14 UTC (rev 4291)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-05-19 Tim
+ Fix white space indenting in C# highlighter (included with PATCH #1556685).
+ Src/editlib: csharp.cpp
+
2007-05-13 Takashi
BUG: [ 1717814 ] Fix header drawing issue on WinXP with Luna Theme
Src/Common/SortHeaderCtrl.cpp
Modified: branches/R2_6/Src/editlib/csharp.cpp
===================================================================
--- branches/R2_6/Src/editlib/csharp.cpp 2007-05-19 12:37:53 UTC (rev 4290)
+++ branches/R2_6/Src/editlib/csharp.cpp 2007-05-19 12:39:14 UTC (rev 4291)
@@ -197,14 +197,14 @@
int I=0;
for (I = 0;; nPrevI = I, I = ::CharNext(pszChars+I) - pszChars)
{
- if (I == nPrevI)
+ if (I == nPrevI)
{
// CharNext did not advance, so we're at the end of the string
// and we already handled this character, so stop
break;
}
- if (bRedefineBlock)
+ if (bRedefineBlock)
{
int nPos = I;
if (bDecIndex)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-05-31 21:56:06
|
Revision: 4305
http://svn.sourceforge.net/winmerge/?rev=4305&view=rev
Author: gerundt
Date: 2007-05-31 14:56:00 -0700 (Thu, 31 May 2007)
Log Message:
-----------
PATCH: [ 1729179 ] Change "Rational Clearcase" to "Rational ClearCase"
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc
branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc
branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc
branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
branches/R2_6/Src/Languages/Czech/MergeCzech.rc
branches/R2_6/Src/Languages/Danish/MergeDanish.rc
branches/R2_6/Src/Languages/Dutch/MergeDutch.rc
branches/R2_6/Src/Languages/French/MergeFrench.rc
branches/R2_6/Src/Languages/German/MergeGerman.rc
branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc
branches/R2_6/Src/Languages/Italian/MergeItalian.rc
branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc
branches/R2_6/Src/Languages/Korean/MergeKorean.rc
branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc
branches/R2_6/Src/Languages/Polish/MergePolish.rc
branches/R2_6/Src/Languages/Russian/MergeRussian.rc
branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc
branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc
branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc
branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc
branches/R2_6/Src/Merge.rc
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-05-31 14:29:28 UTC (rev 4304)
+++ branches/R2_6/Src/Changes.txt 2007-05-31 21:56:00 UTC (rev 4305)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-05-31 Tim
+ PATCH: [ 1729179 ] Change "Rational Clearcase" to "Rational ClearCase"
+ Src: Merge.rc
+ Src/Languages/*: Merge*.rc
+
2007-05-29 Takashi
BUG [ 1722197 ] Downgrading from 2.7.3.4 to 2.6.6 causes Explorer crash
ShellExtension: WinMergeShell.cpp
Modified: branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc
===================================================================
--- branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc 2007-05-31 14:29:28 UTC (rev 4304)
+++ branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc 2007-05-31 21:56:00 UTC (rev 4305)
@@ -827,7 +827,7 @@
IDD_CLEARCASE DIALOGEX 0, 0, 279, 134
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Rational Clearcase"
+CAPTION "Rational ClearCase"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "CheckOut",IDOK,169,115,50,14
Modified: branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-05-31 14:29:28 UTC (rev 4304)
+++ branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-05-31 21:56:00 UTC (rev 4305)
@@ -827,7 +827,7 @@
IDD_CLEARCASE DIALOGEX 0, 0, 279, 134
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Rational Clearcase"
+CAPTION "Rational ClearCase"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "\xC4\xE5\xE9\xF1\xF2\xE2\xE0\xE9",IDOK,169,115,50,14
Modified: branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc 2007-05-31 14:29:28 UTC (rev 4304)
+++ branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc 2007-05-31 21:56:00 UTC (rev 4305)
@@ -827,7 +827,7 @@
IDD_CLEARCASE DIALOGEX 0, 0, 279, 134
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Rational Clearcase"
+CAPTION "Rational ClearCase"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "&Extreu (check-out)",IDOK,115,115,70,14
Modified: branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
===================================================================
--- branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-05-31 14:29:28 UTC (rev 4304)
+++ branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-05-31 21:56:00 UTC (rev 4305)
@@ -828,7 +828,7 @@
IDD_CLEARCASE DIALOGEX 0, 0, 279, 134
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Rational Clearcase"
+CAPTION "Rational ClearCase"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "\xB5\xF7\xCA\xD4",IDOK,169,115,50,14
Modified: branches/R2_6/Src/Languages/Czech/MergeCzech.rc
===================================================================
--- branches/R2_6/Src/Languages/Czech/MergeCzech.rc 2007-05-31 14:29:28 UTC (rev 4304)
+++ branches/R2_6/Src/Languages/Czech/MergeCzech.rc 2007-05-31 21:56:00 UTC (rev 4305)
@@ -827,7 +827,7 @@
IDD_CLEARCASE DIALOGEX 0, 0, 279, 134
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Rational Clearcase"
+CAPTION "Rational ClearCase"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "CheckOut",IDOK,169,115,50,14
Modified: branches/R2_6/Src/Languages/Danish/MergeDanish.rc
===================================================================
--- branches/R2_6/Src/Languages/Danish/MergeDanish.rc 2007-05-31 14:29:28 UTC (rev 4304)
+++ branches/R2_6/Src/Languages/Danish/MergeDanish.rc 2007-05-31 21:56:00 UTC (rev 4305)
@@ -827,7 +827,7 @@
IDD_CLEARCASE DIALOGEX 0, 0, 279, 134
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Rational Clearcase"
+CAPTION "Rational ClearCase"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "CheckOut",IDOK,169,115,50,14
Modified: branches/R2_6/Src/Languages/Dutch/MergeDutch.rc
===================================================================
--- branches/R2_6/Src/Languages/Dutch/MergeDutch.rc 2007-05-31 14:29:28 UTC (rev 4304)
+++ branches/R2_6/Src/Languages/Dutch/MergeDutch.rc 2007-05-31 21:56:00 UTC (rev 4305)
@@ -827,7 +827,7 @@
IDD_CLEARCASE DIALOGEX 0, 0, 279, 134
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Rational Clearcase"
+CAPTION "Rational ClearCase"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "Check-out",IDOK,169,115,50,14
Modified: branches/R2_6/Src/Languages/French/MergeFrench.rc
===================================================================
--- branches/R2_6/Src/Languages/French/MergeFrench.rc 2007-05-31 14:29:28 UTC (rev 4304)
+++ branches/R2_6/Src/Languages/French/MergeFrench.rc 2007-05-31 21:56:00 UTC (rev 4305)
@@ -825,7 +825,7 @@
IDD_CLEARCASE DIALOGEX 0, 0, 279, 134
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Rational Clearcase"
+CAPTION "Rational ClearCase"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "&Extraire",IDOK,169,115,68,14
Modified: branches/R2_6/Src/Languages/German/MergeGerman.rc
===================================================================
--- branches/R2_6/Src/Languages/German/MergeGerman.rc 2007-05-31 14:29:28 UTC (rev 4304)
+++ branches/R2_6/Src/Languages/German/MergeGerman.rc 2007-05-31 21:56:00 UTC (rev 4305)
@@ -827,7 +827,7 @@
IDD_CLEARCASE DIALOGEX 0, 0, 279, 134
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Rational Clearcase"
+CAPTION "Rational ClearCase"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "Auschecken",IDOK,169,115,50,14
Modified: branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc
===================================================================
--- branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc 2007-05-31 14:29:28 UTC (rev 4304)
+++ branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc 2007-05-31 21:56:00 UTC (rev 4305)
@@ -827,7 +827,7 @@
IDD_CLEARCASE DIALOGEX 0, 0, 279, 134
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Rational Clearcase"
+CAPTION "Rational ClearCase"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "Ellen\xF5riz",IDOK,169,115,50,14
Modified: branches/R2_6/Src/Languages/Italian/MergeItalian.rc
===================================================================
--- branches/R2_6/Src/Languages/Italian/MergeItalian.rc 2007-05-31 14:29:28 UTC (rev 4304)
+++ branches/R2_6/Src/Languages/Italian/MergeItalian.rc 2007-05-31 21:56:00 UTC (rev 4305)
@@ -827,7 +827,7 @@
IDD_CLEARCASE DIALOGEX 0, 0, 279, 134
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Rational Clearcase"
+CAPTION "Rational ClearCase"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "Estrai",IDOK,169,115,50,14
Modified: branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc
===================================================================
--- branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc 2007-05-31 14:29:28 UTC (rev 4304)
+++ branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc 2007-05-31 21:56:00 UTC (rev 4305)
@@ -827,7 +827,7 @@
IDD_CLEARCASE DIALOGEX 0, 0, 279, 134
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Rational Clearcase"
+CAPTION "Rational ClearCase"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "\x83`\x83F\x83b\x83N\x83A\x83E\x83g",IDOK,169,115,50,14
Modified: branches/R2_6/Src/Languages/Korean/MergeKorean.rc
===================================================================
--- branches/R2_6/Src/Languages/Korean/MergeKorean.rc 2007-05-31 14:29:28 UTC (rev 4304)
+++ branches/R2_6/Src/Languages/Korean/MergeKorean.rc 2007-05-31 21:56:00 UTC (rev 4305)
@@ -827,7 +827,7 @@
IDD_CLEARCASE DIALOGEX 0, 0, 279, 134
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Rational Clearcase"
+CAPTION "Rational ClearCase"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "üũ\xBEƿ\xF4",IDOK,169,115,50,14
Modified: branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc
===================================================================
--- branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc 2007-05-31 14:29:28 UTC (rev 4304)
+++ branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc 2007-05-31 21:56:00 UTC (rev 4305)
@@ -827,7 +827,7 @@
IDD_CLEARCASE DIALOGEX 0, 0, 279, 134
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Rational Clearcase"
+CAPTION "Rational ClearCase"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "CheckOut",IDOK,169,115,50,14
Modified: branches/R2_6/Src/Languages/Polish/MergePolish.rc
===================================================================
--- branches/R2_6/Src/Languages/Polish/MergePolish.rc 2007-05-31 14:29:28 UTC (rev 4304)
+++ branches/R2_6/Src/Languages/Polish/MergePolish.rc 2007-05-31 21:56:00 UTC (rev 4305)
@@ -827,7 +827,7 @@
IDD_CLEARCASE DIALOGEX 0, 0, 279, 134
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Rational Clearcase"
+CAPTION "Rational ClearCase"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "Sprawd\x9F",IDOK,169,115,50,14
Modified: branches/R2_6/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- branches/R2_6/Src/Languages/Russian/MergeRussian.rc 2007-05-31 14:29:28 UTC (rev 4304)
+++ branches/R2_6/Src/Languages/Russian/MergeRussian.rc 2007-05-31 21:56:00 UTC (rev 4305)
@@ -827,7 +827,7 @@
IDD_CLEARCASE DIALOGEX 0, 0, 279, 134
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Rational Clearcase"
+CAPTION "Rational ClearCase"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "\xCF\xF0\xEE\xE2\xE5\xF0\xE8\xF2\xFC",IDOK,169,115,50,14
Modified: branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc
===================================================================
--- branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc 2007-05-31 14:29:28 UTC (rev 4304)
+++ branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc 2007-05-31 21:56:00 UTC (rev 4305)
@@ -827,7 +827,7 @@
IDD_CLEARCASE DIALOGEX 0, 0, 279, 134
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Rational Clearcase"
+CAPTION "Rational ClearCase"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "CheckOut",IDOK,169,115,50,14
Modified: branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc
===================================================================
--- branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc 2007-05-31 14:29:28 UTC (rev 4304)
+++ branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc 2007-05-31 21:56:00 UTC (rev 4305)
@@ -827,7 +827,7 @@
IDD_CLEARCASE DIALOGEX 0, 0, 279, 134
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Rational Clearcase"
+CAPTION "Rational ClearCase"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "Desproteger",IDOK,169,115,50,14
Modified: branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc 2007-05-31 14:29:28 UTC (rev 4304)
+++ branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc 2007-05-31 21:56:00 UTC (rev 4305)
@@ -827,7 +827,7 @@
IDD_CLEARCASE DIALOGEX 0, 0, 279, 134
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Rational Clearcase"
+CAPTION "Rational ClearCase"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "Verkst\xE4ll",IDOK,169,115,50,14
Modified: branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc
===================================================================
--- branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc 2007-05-31 14:29:28 UTC (rev 4304)
+++ branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc 2007-05-31 21:56:00 UTC (rev 4305)
@@ -827,7 +827,7 @@
IDD_CLEARCASE DIALOGEX 0, 0, 279, 134
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Rational Clearcase"
+CAPTION "Rational ClearCase"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "CheckOut",IDOK,169,115,50,14
Modified: branches/R2_6/Src/Merge.rc
===================================================================
--- branches/R2_6/Src/Merge.rc 2007-05-31 14:29:28 UTC (rev 4304)
+++ branches/R2_6/Src/Merge.rc 2007-05-31 21:56:00 UTC (rev 4305)
@@ -837,7 +837,7 @@
IDD_CLEARCASE DIALOGEX 0, 0, 279, 134
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Rational Clearcase"
+CAPTION "Rational ClearCase"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "CheckOut",IDOK,169,115,50,14
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-06-14 19:51:36
|
Revision: 4335
http://svn.sourceforge.net/winmerge/?rev=4335&view=rev
Author: kimmov
Date: 2007-06-14 12:51:35 -0700 (Thu, 14 Jun 2007)
Log Message:
-----------
PATCH: [ 1727878 ] 26Branch: Disable hiding folder compare confirmation dialogs
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/DirActions.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-06-14 19:26:30 UTC (rev 4334)
+++ branches/R2_6/Src/Changes.txt 2007-06-14 19:51:35 UTC (rev 4335)
@@ -7,6 +7,8 @@
ShellExtension: ShellExtension.rc
PATCH: [ 1735240 ] Copy new Delphi- and Symbian -file filters to 2.6 branch
Filters new files: Delphi.flt Symbian.flt
+ PATCH: [ 1727878 ] 26Branch: Disable hiding folder compare confirmation dialogs
+ Src: DirActions.cpp
2007-06-07 Kimmo
PATCH: [ 1721815 ] Add CSharp file filter for 2.6.x
Modified: branches/R2_6/Src/DirActions.cpp
===================================================================
--- branches/R2_6/Src/DirActions.cpp 2007-06-14 19:26:30 UTC (rev 4334)
+++ branches/R2_6/Src/DirActions.cpp 2007-06-14 19:51:35 UTC (rev 4335)
@@ -48,7 +48,7 @@
CString s;
ASSERT(count>1);
AfxFormatString2(s, IDS_CONFIRM_COPY2DIR, NumToStr(count), NumToStr(total));
- int rtn = AfxMessageBox(s, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_CONFIRM_COPY2DIR);
+ int rtn = AfxMessageBox(s, MB_YESNO | MB_ICONWARNING);
return (rtn==IDYES);
}
@@ -57,7 +57,7 @@
{
CString s;
AfxFormatString2(s, IDS_CONFIRM_COPY_SINGLE, src, dest);
- int rtn = AfxMessageBox(s, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_CONFIRM_COPY_SINGLE);
+ int rtn = AfxMessageBox(s, MB_YESNO | MB_ICONWARNING);
return (rtn==IDYES);
}
@@ -66,7 +66,7 @@
{
CString s;
AfxFormatString2(s, IDS_CONFIRM_DELETE_ITEMS, NumToStr(count), NumToStr(total));
- int rtn = AfxMessageBox(s, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_CONFIRM_DELETE_ITEMS);
+ int rtn = AfxMessageBox(s, MB_YESNO | MB_ICONWARNING);
return (rtn==IDYES);
}
@@ -75,7 +75,7 @@
{
CString s;
AfxFormatString1(s, IDS_CONFIRM_DELETE_SINGLE, filepath);
- int rtn = AfxMessageBox(s, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_CONFIRM_DELETE_SINGLE);
+ int rtn = AfxMessageBox(s, MB_YESNO | MB_ICONWARNING);
return (rtn==IDYES);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jt...@us...> - 2007-06-16 05:43:43
|
Revision: 4339
http://svn.sourceforge.net/winmerge/?rev=4339&view=rev
Author: jtuc
Date: 2007-06-15 22:43:41 -0700 (Fri, 15 Jun 2007)
Log Message:
-----------
Fix Bug #1723263 "Zip --> Both"
Modified Paths:
--------------
branches/R2_6/Src/7zCommon.cpp
branches/R2_6/Src/Changes.txt
Modified: branches/R2_6/Src/7zCommon.cpp
===================================================================
--- branches/R2_6/Src/7zCommon.cpp 2007-06-16 05:19:58 UTC (rev 4338)
+++ branches/R2_6/Src/7zCommon.cpp 2007-06-16 05:43:41 UTC (rev 4339)
@@ -85,6 +85,7 @@
2005/08/20 Jochen Tucht Option to guess archive format by signature
Map extensions through ExternalArchiveFormat.ini
2005/08/23 Jochen Tucht Option to entirely disable 7-Zip integration
+2007/06/16 Jochen Neubeck FIX [1723263] "Zip --> Both" operation...
*/
// RCS ID line follows -- this is updated by CVS
@@ -928,6 +929,8 @@
di.getRightFilepath(pDoc->GetRightBasePath()) :
di.getLeftFilepath(pDoc->GetLeftBasePath()));
+ UINT32 Recurse = item.Mask.Recurse;
+
if (m_nFlags & BalanceFolders)
{
if (m_bRight)
@@ -945,6 +948,7 @@
envelope->FullPath = di.getLeftFilepath(pDoc->GetLeftBasePath());
implied = PVOID(2); // Don't enumerate same folder twice!
isSideLeft = false;
+ Recurse = 0;
}
}
}
@@ -963,6 +967,7 @@
envelope->FullPath = di.getRightFilepath(pDoc->GetRightBasePath());
implied = PVOID(2); // Don't enumerate same folder twice!
isSideRight = false;
+ Recurse = 0;
}
}
}
@@ -975,11 +980,12 @@
if (m_strFolderPrefix.GetLength())
{
- envelope->Name.Insert(0, '\\');
+ if (envelope->Name.GetLength())
+ envelope->Name.Insert(0, '\\');
envelope->Name.Insert(0, m_strFolderPrefix);
}
- item.Mask.Item = item.Mask.Name|item.Mask.FullPath|item.Mask.CheckIfPresent|item.Mask.Recurse;
+ item.Mask.Item = item.Mask.Name|item.Mask.FullPath|item.Mask.CheckIfPresent|Recurse;
item.Name = envelope->Name;
item.FullPath = envelope->FullPath;
return envelope;
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-06-16 05:19:58 UTC (rev 4338)
+++ branches/R2_6/Src/Changes.txt 2007-06-16 05:43:41 UTC (rev 4339)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-06-16 Jochen
+ PATCH: [ 1734439 ] Fix Bug #1723263 "Zip --> Both" operation give unwanted content in output
+ Src: 7zCommon.cpp
+
2007-06-14 Kimmo
Bump ShellExtension version to 1.9.3
ShellExtension: ShellExtension.rc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2007-06-17 07:06:33
|
Revision: 4340
http://svn.sourceforge.net/winmerge/?rev=4340&view=rev
Author: galh
Date: 2007-06-17 00:06:31 -0700 (Sun, 17 Jun 2007)
Log Message:
-----------
BUG: [ 1705874 ] Hitting escape during listitem rename also exited winmerge
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/DirView.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-06-16 05:43:41 UTC (rev 4339)
+++ branches/R2_6/Src/Changes.txt 2007-06-17 07:06:31 UTC (rev 4340)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-06-17 Gal
+ BUG: [ 1705874 ] Hitting escape during listitem rename also exited winmerge
+ Src: DirView.cpp
+
2007-06-16 Jochen
PATCH: [ 1734439 ] Fix Bug #1723263 "Zip --> Both" operation give unwanted content in output
Src: 7zCommon.cpp
Modified: branches/R2_6/Src/DirView.cpp
===================================================================
--- branches/R2_6/Src/DirView.cpp 2007-06-16 05:43:41 UTC (rev 4339)
+++ branches/R2_6/Src/DirView.cpp 2007-06-17 07:06:31 UTC (rev 4340)
@@ -1978,6 +1978,14 @@
if (TRUE == IsLabelEdit())
{
m_bUserCancelEdit = TRUE;
+
+ // The edit control send LVN_ENDLABELEDIT when it loses focus,
+ // so we use it to cancel the rename action.
+ m_pList->SetFocus();
+
+ // Stop the ESC before it reach the main frame which might
+ // cause a program termination.
+ return TRUE;
}
else if (m_bEscCloses)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-06-17 19:45:28
|
Revision: 4341
http://svn.sourceforge.net/winmerge/?rev=4341&view=rev
Author: gerundt
Date: 2007-06-17 12:45:26 -0700 (Sun, 17 Jun 2007)
Log Message:
-----------
PATCH: [ 1722213 ] Fix wrong </endtag> syntax color in HTML highlighters
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/editlib/asp.cpp
branches/R2_6/Src/editlib/html.cpp
branches/R2_6/Src/editlib/php.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-06-17 07:06:31 UTC (rev 4340)
+++ branches/R2_6/Src/Changes.txt 2007-06-17 19:45:26 UTC (rev 4341)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-06-17 Tim
+ PATCH: [ 1722213 ] Fix wrong </endtag> syntax color in HTML highlighters
+ Src/editlib: asp.cpp html.cpp php.cpp
+
2007-06-17 Gal
BUG: [ 1705874 ] Hitting escape during listitem rename also exited winmerge
Src: DirView.cpp
Modified: branches/R2_6/Src/editlib/asp.cpp
===================================================================
--- branches/R2_6/Src/editlib/asp.cpp 2007-06-17 07:06:31 UTC (rev 4340)
+++ branches/R2_6/Src/editlib/asp.cpp 2007-06-17 19:45:26 UTC (rev 4341)
@@ -876,6 +876,7 @@
// Preprocessor start: < or bracket
if (!(dwCookie & COOKIE_EXT_USER1) && I < nLength && pszChars[I] == '<' && !(I < nLength - 3 && pszChars[I + 1] == '!' && pszChars[I + 2] == '-' && pszChars[I + 3] == '-'))
{
+ DEFINE_BLOCK (I, COLORINDEX_OPERATOR);
DEFINE_BLOCK (I + 1, COLORINDEX_PREPROCESSOR);
dwCookie |= COOKIE_PREPROCESSOR;
nIdentBegin = -1;
Modified: branches/R2_6/Src/editlib/html.cpp
===================================================================
--- branches/R2_6/Src/editlib/html.cpp 2007-06-17 07:06:31 UTC (rev 4340)
+++ branches/R2_6/Src/editlib/html.cpp 2007-06-17 19:45:26 UTC (rev 4341)
@@ -658,6 +658,7 @@
// Preprocessor start: < or bracket
if (!(dwCookie & COOKIE_EXT_USER1) && I < nLength && (pszChars[I] == '<' && !(I < nLength - 3 && pszChars[I + 1] == '!' && pszChars[I + 2] == '-' && pszChars[I + 3] == '-')/* || pszChars[I] == '{'*/))
{
+ DEFINE_BLOCK (I, COLORINDEX_OPERATOR);
DEFINE_BLOCK (I + 1, COLORINDEX_PREPROCESSOR);
dwCookie |= COOKIE_PREPROCESSOR;
nIdentBegin = -1;
@@ -763,6 +764,7 @@
// Preprocessor start: < or {
if (!(dwCookie & COOKIE_EXT_USER1) && I < nLength && (pszChars[I] == '<' && !(I < nLength - 3 && pszChars[I + 1] == '!' && pszChars[I + 2] == '-' && pszChars[I + 3] == '-')/* || pszChars[I] == '{'*/))
{
+ DEFINE_BLOCK (I, COLORINDEX_OPERATOR);
DEFINE_BLOCK (I + 1, COLORINDEX_PREPROCESSOR);
dwCookie |= COOKIE_PREPROCESSOR;
nIdentBegin = -1;
Modified: branches/R2_6/Src/editlib/php.cpp
===================================================================
--- branches/R2_6/Src/editlib/php.cpp 2007-06-17 07:06:31 UTC (rev 4340)
+++ branches/R2_6/Src/editlib/php.cpp 2007-06-17 19:45:26 UTC (rev 4341)
@@ -836,6 +836,7 @@
// Preprocessor start: < or bracket
if (!(dwCookie & COOKIE_EXT_USER1) && I < nLength && pszChars[I] == '<' && !(I < nLength - 3 && pszChars[I + 1] == '!' && pszChars[I + 2] == '-' && pszChars[I + 3] == '-'))
{
+ DEFINE_BLOCK (I, COLORINDEX_OPERATOR);
DEFINE_BLOCK (I + 1, COLORINDEX_PREPROCESSOR);
dwCookie |= COOKIE_PREPROCESSOR;
nIdentBegin = -1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-08-12 20:54:55
|
Revision: 4423
http://winmerge.svn.sourceforge.net/winmerge/?rev=4423&view=rev
Author: gerundt
Date: 2007-08-12 13:54:54 -0700 (Sun, 12 Aug 2007)
Log Message:
-----------
PATCH: [ 1772028 ] Russian translation update (from WinMergeMod)
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Languages/Russian/MergeRussian.rc
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-08-12 20:09:58 UTC (rev 4422)
+++ branches/R2_6/Src/Changes.txt 2007-08-12 20:54:54 UTC (rev 4423)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-08-12 Tim
+ PATCH: [ 1772028 ] Russian translation update (from WinMergeMod)
+ Src/Languages/Russian: MergeRussian.rc
+
2007-07-13 Kimmo
Add Alberto Kalb to contributors list
Docs/Users: Contributors.txt
Modified: branches/R2_6/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- branches/R2_6/Src/Languages/Russian/MergeRussian.rc 2007-08-12 20:09:58 UTC (rev 4422)
+++ branches/R2_6/Src/Languages/Russian/MergeRussian.rc 2007-08-12 20:54:54 UTC (rev 4423)
@@ -103,7 +103,7 @@
MENUITEM "\xD1\xEA\xEE\xEF\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xED\xE0 &\xEF\xF0\xE0\xE2\xF3\xFE \xEF\xE0\xED\xE5\xEB\xFC", ID_L2R
MENUITEM "\xD1\xEA\xEE\xEF\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xED\xE0 &\xEB\xE5\xE2\xF3\xFE \xEF\xE0\xED\xE5\xEB\xFC", ID_R2L
MENUITEM SEPARATOR
- MENUITEM "&Select Line Difference", ID_SELECTLINEDIFF
+ MENUITEM "&\xC2\xFB\xE1\xF0\xE0\xF2\xFC \xEE\xF2\xEB\xE8\xF7\xE8\xE5", ID_SELECTLINEDIFF
MENUITEM SEPARATOR
MENUITEM "&\xCE\xF2\xEC\xE5\xED\xE0", ID_EDIT_UNDO
MENUITEM "\xC2&\xE5\xF0\xED\xF3\xF2\xFC", ID_EDIT_REDO
@@ -116,9 +116,9 @@
MENUITEM SEPARATOR
POPUP "Op&en"
BEGIN
- MENUITEM "with &Registered Application", ID_FILE_OPEN_REGISTERED
- MENUITEM "with &External Editor", ID_FILE_OPEN_WITHEDITOR
- MENUITEM "&with...", ID_FILE_OPEN_WITH
+ MENUITEM "\xE7\xE0\xF0\xE5\xE3\xE8\xF1\xF2\xF0\xE8\xF0\xEE\xE2\xE0\xED\xED\xFB\xEC \xEF\xF0\xE8\xEB\xEE\xE6\xE5\xED\xE8\xE5\xEC", ID_FILE_OPEN_REGISTERED
+ MENUITEM "\xE2\xED\xE5\xF8\xED\xE8\xEC \xF0\xE5\xE4\xE0\xEA\xF2\xEE\xF0\xEE\xEC", ID_FILE_OPEN_WITHEDITOR
+ MENUITEM "\xF1 \xEF\xEE\xEC\xEE\xF9\xFC\xFE...", ID_FILE_OPEN_WITH
END
END
END
@@ -127,12 +127,12 @@
BEGIN
POPUP "_POPUP_"
BEGIN
- MENUITEM "C&opy to Right", ID_L2R
- MENUITEM "Cop&y to Left", ID_R2L
+ MENUITEM "\xD1\xEA\xEE\xEF\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xED\xE0 &\xEF\xF0\xE0\xE2\xF3\xFE \xEF\xE0\xED\xE5\xEB\xFC", ID_L2R
+ MENUITEM "\xD1\xEA\xEE\xEF\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xED\xE0 &\xEB\xE5\xE2\xF3\xFE \xEF\xE0\xED\xE5\xEB\xFC", ID_R2L
MENUITEM SEPARATOR
- MENUITEM "Cu&t", ID_EDIT_CUT
- MENUITEM "&Copy", ID_EDIT_COPY
- MENUITEM "&Paste", ID_EDIT_PASTE
+ MENUITEM "\xC2&\xFB\xF0\xE5\xE7\xE0\xF2\xFC", ID_EDIT_CUT
+ MENUITEM "&\xCA\xEE\xEF\xE8\xF0\xEE\xE2\xE0\xF2\xFC", ID_EDIT_COPY
+ MENUITEM "&\xC2\xF1\xF2\xE0\xE2\xE8\xF2\xFC", ID_EDIT_PASTE
END
END
@@ -144,7 +144,7 @@
MENUITEM "&\xCE\xF2\xEA\xF0\xFB\xF2\xFC...\tCtrl+O", ID_FILE_OPEN
MENUITEM SEPARATOR
MENUITEM "\xCE\xF2\xEA\xF0\xFB\xF2\xFC \xEF\xF0\xEE\xE5\xEA\xF2...\tCtrl+J", ID_FILE_OPENPROJECT
- MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT
+ MENUITEM "\xD1\xEE\xF5\xF0\xE0\xED\xE8\xF2\xFC \xEF\xF0\xEE\xE5\xEA\xF2...", ID_FILE_SAVEPROJECT
MENUITEM SEPARATOR
MENUITEM "\xC2&\xFB\xF5\xEE\xE4", ID_APP_EXIT
END
@@ -183,7 +183,7 @@
POPUP "&\xCE\xEA\xED\xEE"
BEGIN
MENUITEM "\xC7\xE0\xEA\xF0\xFB\xF2\xFC", ID_FILE_CLOSE
- MENUITEM "Clo&se All", ID_WINDOW_CLOSEALL
+ MENUITEM "\xC7\xE0\xEA\xF0\xFB\xF2\xFC \xE2\xF1\xE5", ID_WINDOW_CLOSEALL
MENUITEM SEPARATOR
MENUITEM "\xCF\xE5\xF0\xE5\xEA\xEB\xFE\xF7\xE8\xF2\xFC &\xCE\xEA\xED\xEE\tF6", ID_WINDOW_CHANGE_PANE
MENUITEM SEPARATOR
@@ -194,13 +194,13 @@
POPUP "&\xCF\xEE\xEC\xEE\xF9\xFC"
BEGIN
MENUITEM "&\xD1\xEE\xE4\xE5\xF0\xE6\xE0\xED\xE8\xE5...\tF1", ID_HELP_CONTENTS
- MENUITEM "&Index...", ID_HELP_INDEX
- MENUITEM "&Search...", ID_HELP_SEARCH
+ MENUITEM "&\xC8\xED\xE4\xE5\xEA\xF1...", ID_HELP_INDEX
+ MENUITEM "&\xCF\xEE\xE8\xF1\xEA...", ID_HELP_SEARCH
MENUITEM SEPARATOR
- MENUITEM "\xCA\xEE\xED\xF4\xE8\xE3\xF3\xF0\xE0\xF6\xE8\xFF...", ID_HELP_GETCONFIG
- MENUITEM "&\xCF\xEE\xE4\xE4\xE5\xF0\xE6\xEA\xE0 \xE0\xF0\xF5\xE8\xE2\xEE\xE2 \xEE\xF2\xEA\xEB\xFE\xF7\xE5\xED\xE0...", ID_HELP_MERGE7ZMISMATCH
+ MENUITEM "&\xCA\xEE\xED\xF4\xE8\xE3\xF3\xF0\xE0\xF6\xE8\xFF...", ID_HELP_GETCONFIG
+ MENUITEM "\xCF\xEE\xE4\xE4\xE5\xF0\xE6\xEA\xE0 &\xE0\xF0\xF5\xE8\xE2\xEE\xE2 \xEE\xF2\xEA\xEB\xFE\xF7\xE5\xED\xE0...", ID_HELP_MERGE7ZMISMATCH
MENUITEM SEPARATOR
- MENUITEM "GNU Public License...", ID_HELP_GNULICENSE
+ MENUITEM "GNU &Public License...", ID_HELP_GNULICENSE
MENUITEM "&\xCE \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xEC\xE5 WinMerge...", ID_APP_ABOUT
END
END
@@ -213,12 +213,12 @@
MENUITEM "&\xCE\xF2\xEA\xF0\xFB\xF2\xFC...\tCtrl+O", ID_FILE_OPEN
MENUITEM SEPARATOR
MENUITEM "\xCE\xF2\xEA\xF0\xFB\xF2\xFC \xEF\xF0\xEE\xE5\xEA\xF2...\tCtrl+J", ID_FILE_OPENPROJECT
- MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT
+ MENUITEM "\xD1\xEE\xF5\xF0\xE0\xED\xE8\xF2\xFC \xEF\xF0\xEE\xE5\xEA\xF2...", ID_FILE_SAVEPROJECT
MENUITEM SEPARATOR
MENUITEM "\xD4\xE0\xE9\xEB \xF1&\xEB\xE5\xE2\xE0 \xF2\xEE\xEB\xFC\xEA\xEE \xE4\xEB\xFF \xF7\xF2\xE5\xED\xE8\xFF", ID_FILE_LEFT_READONLY
- MENUITEM "\xD4\xE0\xE9\xEB \xF1&\xEB\xE5\xE2\xE0 \xF2\xEE\xEB\xFC\xEA\xEE \xE4\xEB\xFF \xF7\xF2\xE5\xED\xE8\xFF", ID_FILE_RIGHT_READONLY
+ MENUITEM "\xD4\xE0\xE9\xEB \xF1&\xEF\xF0\xE0\xE2\xE0 \xF2\xEE\xEB\xFC\xEA\xEE \xE4\xEB\xFF \xF7\xF2\xE5\xED\xE8\xFF", ID_FILE_RIGHT_READONLY
MENUITEM SEPARATOR
- MENUITEM "File &Encoding", ID_FILE_ENCODING
+ MENUITEM "\xCA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0 \xF4\xE0\xE9\xEB\xE0", ID_FILE_ENCODING
MENUITEM SEPARATOR
MENUITEM "\xC2&\xFB\xF5\xEE\xE4", ID_APP_EXIT
END
@@ -229,31 +229,31 @@
MENUITEM "&\xCD\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8...", ID_OPTIONS
MENUITEM SEPARATOR
MENUITEM "&\xCE\xE1\xED\xEE\xE2\xE8\xF2\xFC\tF5", ID_REFRESH
- MENUITEM "&Refresh Selected\tCtrl+F5", ID_DIR_RESCAN
+ MENUITEM "\xCE\xE1\xED\xEE\xE2\xE8\xF2\xFC &\xE2\xFB\xE4\xE5\xEB\xE5\xED\xED\xFB\xE5\tCtrl+F5", ID_DIR_RESCAN
END
POPUP "&\xC2\xE8\xE4"
BEGIN
- MENUITEM "Show &Identical Items", ID_OPTIONS_SHOWIDENTICAL
- MENUITEM "Show &Different Items", ID_OPTIONS_SHOWDIFFERENT
- MENUITEM "Show L&eft Unique Items", ID_OPTIONS_SHOWUNIQUELEFT
- MENUITEM "Show Ri&ght Unique Items", ID_OPTIONS_SHOWUNIQUERIGHT
- MENUITEM "Show S&kipped Items", ID_OPTIONS_SHOWSKIPPED
- MENUITEM "S&how Binary Files", ID_OPTIONS_SHOWBINARIES
+ MENUITEM "\xCE\xE4\xE8\xED\xE0\xEA\xEE\xE2\xFB\xE5", ID_OPTIONS_SHOWIDENTICAL
+ MENUITEM "\xD0\xE0\xE7\xEB\xE8\xF7\xED\xFB\xE5", ID_OPTIONS_SHOWDIFFERENT
+ MENUITEM "\xD3\xED\xE8\xEA\xE0\xEB\xFC\xED\xFB\xE5 \xF1\xEB\xE5\xE2\xE0", ID_OPTIONS_SHOWUNIQUELEFT
+ MENUITEM "\xD3\xED\xE8\xEA\xE0\xEB\xFC\xED\xFB\xE5 \xF1\xEF\xF0\xE0\xE2\xE0", ID_OPTIONS_SHOWUNIQUERIGHT
+ MENUITEM "\xCF\xF0\xEE\xEF\xF3\xF9\xE5\xED\xED\xFB\xE5", ID_OPTIONS_SHOWSKIPPED
+ MENUITEM "\xC1\xE8\xED\xE0\xF0\xED\xFB\xE5 \xF4\xE0\xE9\xEB\xFB", ID_OPTIONS_SHOWBINARIES
MENUITEM SEPARATOR
- MENUITEM "Show Hidd&en Items", ID_VIEW_SHOWHIDDENITEMS
+ MENUITEM "\xD1\xEA\xF0\xFB\xF2\xFB\xE5", ID_VIEW_SHOWHIDDENITEMS
MENUITEM SEPARATOR
MENUITEM "\xC2\xFB\xE1\xF0\xE0\xF2\xFC &\xD8\xF0\xE8\xF4\xF2...", ID_VIEW_SELECTFONT
MENUITEM "\xC8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xF8\xF0\xE8\xF4\xF2 \xEF\xEE &\xF3\xEC\xEE\xEB\xF7\xE0\xED\xE8\xFE", ID_VIEW_USEDEFAULTFONT
MENUITEM SEPARATOR
MENUITEM "\xCF\xE0&\xED\xE5\xEB\xFC \xE8\xED\xF1\xF2\xF0\xF3\xEC\xE5\xED\xF2\xEE\xE2", ID_VIEW_TOOLBAR
MENUITEM "&\xD1\xF2\xF0\xEE\xEA\xE0 \xF1\xEE\xF1\xF2\xEE\xFF\xED\xE8\xFF", ID_VIEW_STATUS_BAR
- MENUITEM "Compa&re Statistics", ID_VIEW_DIR_STATISTICS
+ MENUITEM "\xD1\xF0\xE0\xE2\xED\xE8\xF2\xFC \xF1\xF2\xE0\xF2\xE8\xF1\xF2\xE8\xEA\xE8", ID_VIEW_DIR_STATISTICS
MENUITEM SEPARATOR
MENUITEM "&\xDF\xE7\xFB\xEA...", ID_VIEW_LANGUAGE
END
POPUP "&\xCE\xE1\xFA\xE5\xE4\xE8\xED\xE5\xED\xE8\xE5"
BEGIN
- MENUITEM "Co&mpare\tEnter", ID_MERGE_COMPARE
+ MENUITEM "\xD1\xF0\xE0\xE2\xED\xE8\xF2\xFC\tEnter", ID_MERGE_COMPARE
MENUITEM SEPARATOR
MENUITEM "&\xD1\xEB\xE5\xE4\xF3\xFE\xF9\xE5\xE5 \xEE\xF2\xEB\xE8\xF7\xE8\xE5\tAlt+Down", ID_NEXTDIFF
MENUITEM "\xCF&\xF0\xE5\xE4\xFB\xE4\xF3\xF9\xE5\xE5 \xEE\xF2\xEB\xE8\xF7\xE8\xE5\tAlt+Up", ID_PREVDIFF
@@ -265,14 +265,14 @@
MENUITEM "\xD1\xEA\xEE\xEF\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xED\xE0 &\xEF\xF0\xE0\xE2\xF3\xFE \xEF\xE0\xED\xE5\xEB\xFC\tAlt+Right", ID_L2R
MENUITEM "\xD1\xEA\xEE\xEF\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xED\xE0 &\xEB\xE5\xE2\xF3\xFE \xEF\xE0\xED\xE5\xEB\xFC\tAlt+Left", ID_R2L
MENUITEM SEPARATOR
- MENUITEM "&Delete\tDel", ID_MERGE_DELETE
+ MENUITEM "&\xD3\xE4\xE0\xEB\xE8\xF2\xFC\tDel", ID_MERGE_DELETE
END
POPUP "&\xC8\xED\xF1\xF2\xF0\xF3\xEC\xE5\xED\xF2\xFB"
BEGIN
MENUITEM "&\xCD\xE0\xF1\xF2\xF0\xEE\xE8\xF2\xFC \xEA\xEE\xEB\xEE\xED\xEA\xE8...", ID_TOOLS_CUSTOMIZECOLUMNS
MENUITEM "&\xD4\xE8\xEB\xFC\xF2\xF0\xFB...", ID_TOOLS_FILTERS
MENUITEM "&\xD1\xEE\xE7\xE4\xE0\xF2\xFC \xEF\xE0\xF2\xF7...", ID_TOOLS_GENERATEPATCH
- MENUITEM "Generate &Report...", ID_TOOLS_GENERATEREPORT
+ MENUITEM "\xD1\xEE\xE7\xE4\xE0\xF2\xFC &\xEE\xF2\xF7\xE5\xF2...", ID_TOOLS_GENERATEREPORT
END
POPUP "&\xCF\xEB\xE0\xE3\xE8\xED\xFB"
BEGIN
@@ -290,24 +290,24 @@
POPUP "&\xCE\xEA\xED\xEE"
BEGIN
MENUITEM "\xC7\xE0\xEA\xF0\xFB\xF2\xFC", ID_FILE_CLOSE
- MENUITEM "Clo&se All", ID_WINDOW_CLOSEALL
+ MENUITEM "\xC7\xE0\xEA\xF0\xFB\xF2\xFC \xE2\xF1\xE5", ID_WINDOW_CLOSEALL
MENUITEM SEPARATOR
MENUITEM "\xCF\xE5\xF0\xE5\xEA\xEB\xFE\xF7\xE8\xF2\xFC &\xCE\xEA\xED\xEE\tF6", ID_WINDOW_CHANGE_PANE
MENUITEM SEPARATOR
- MENUITEM "\xD0\xE0\xE7\xEC\xE5\xF1\xF2\xE8\xF2\xFC &\xC3\xEE\xF0\xE8\xE7\xEE\xED\xF2\xE0\xEB\xFC\xED\xEE", ID_WINDOW_TILE_HORZ
- MENUITEM "\xD0\xE0\xE7\xEC\xE5\xF1\xF2\xE8\xF2\xFC &\xC2\xE5\xF0\xF2\xE8\xEA\xE0\xEB\xFC\xED\xEE", ID_WINDOW_TILE_VERT
+ MENUITEM "&\xC3\xEE\xF0\xE8\xE7\xEE\xED\xF2\xE0\xEB\xFC\xED\xEE", ID_WINDOW_TILE_HORZ
+ MENUITEM "&\xC2\xE5\xF0\xF2\xE8\xEA\xE0\xEB\xFC\xED\xEE", ID_WINDOW_TILE_VERT
MENUITEM "&\xCA\xE0\xF1\xEA\xE0\xE4", ID_WINDOW_CASCADE
END
POPUP "&\xCF\xEE\xEC\xEE\xF9\xFC"
BEGIN
MENUITEM "&\xD1\xEE\xE4\xE5\xF0\xE6\xE0\xED\xE8\xE5...\tF1", ID_HELP_CONTENTS
- MENUITEM "&Index...", ID_HELP_INDEX
- MENUITEM "&Search...", ID_HELP_SEARCH
+ MENUITEM "&\xC8\xED\xE4\xE5\xEA\xF1...", ID_HELP_INDEX
+ MENUITEM "&\xCF\xEE\xE8\xF1\xEA...", ID_HELP_SEARCH
MENUITEM SEPARATOR
- MENUITEM "\xCA\xEE\xED\xF4\xE8\xE3\xF3\xF0\xE0\xF6\xE8\xFF...", ID_HELP_GETCONFIG
- MENUITEM "&\xCF\xEE\xE4\xE4\xE5\xF0\xE6\xEA\xE0 \xE0\xF0\xF5\xE8\xE2\xEE\xE2 \xEE\xF2\xEA\xEB\xFE\xF7\xE5\xED\xE0...", ID_HELP_MERGE7ZMISMATCH
+ MENUITEM "&\xCA\xEE\xED\xF4\xE8\xE3\xF3\xF0\xE0\xF6\xE8\xFF...", ID_HELP_GETCONFIG
+ MENUITEM "\xCF\xEE\xE4\xE4\xE5\xF0\xE6\xEA\xE0 &\xE0\xF0\xF5\xE8\xE2\xEE\xE2 \xEE\xF2\xEA\xEB\xFE\xF7\xE5\xED\xE0...", ID_HELP_MERGE7ZMISMATCH
MENUITEM SEPARATOR
- MENUITEM "GNU Public License...", ID_HELP_GNULICENSE
+ MENUITEM "GNU &Public License...", ID_HELP_GNULICENSE
MENUITEM "&\xCE \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xEC\xE5 WinMerge...", ID_APP_ABOUT
END
END
@@ -320,7 +320,7 @@
MENUITEM "&\xCE\xF2\xEA\xF0\xFB\xF2\xFC...\tCtrl+O", ID_FILE_OPEN
MENUITEM SEPARATOR
MENUITEM "\xCE\xF2\xEA\xF0\xFB\xF2\xFC \xEF\xF0\xEE\xE5\xEA\xF2...\tCtrl+J", ID_FILE_OPENPROJECT
- MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT
+ MENUITEM "\xD1\xEE\xF5\xF0\xE0\xED\xE8\xF2\xFC \xEF\xF0\xEE\xE5\xEA\xF2...", ID_FILE_SAVEPROJECT
MENUITEM SEPARATOR
MENUITEM "&\xD1\xEE\xF5\xF0\xE0\xED\xE8\xF2\xFC\tCtrl+S", ID_FILE_SAVE
POPUP "\xD1\xEE\xF5\xF0\xE0\xED\xE8\xF2\xFC \xF4\xE0\xE9\xEB \xF1&\xEB\xE5\xE2\xE0"
@@ -334,13 +334,13 @@
MENUITEM "\xD1\xEE\xF5\xF0\xE0\xED\xE8\xF2\xFC &\xEA\xE0\xEA...", ID_FILE_SAVEAS_RIGHT
END
MENUITEM SEPARATOR
- MENUITEM "&Print...", ID_FILE_PRINT
- MENUITEM "Print P&review", ID_FILE_PRINT_PREVIEW
+ MENUITEM "&\xCF\xE5\xF7\xE0\xF2\xFC...", ID_FILE_PRINT
+ MENUITEM "\xCF\xF0\xE5\xE4\xE2\xE0\xF0\xE8\xF2\xE5\xEB\xFC\xED\xFB\xE9 \xEF\xF0\xEE\xF1\xEC\xEE\xF2\xF0", ID_FILE_PRINT_PREVIEW
MENUITEM SEPARATOR
MENUITEM "\xD4\xE0\xE9\xEB \xF1&\xEB\xE5\xE2\xE0 \xF2\xEE\xEB\xFC\xEA\xEE \xE4\xEB\xFF \xF7\xF2\xE5\xED\xE8\xFF", ID_FILE_LEFT_READONLY
MENUITEM "\xD4\xE0\xE9\xEB \xF1&\xEB\xE5\xE2\xE0 \xF2\xEE\xEB\xFC\xEA\xEE \xE4\xEB\xFF \xF7\xF2\xE5\xED\xE8\xFF", ID_FILE_RIGHT_READONLY
MENUITEM SEPARATOR
- POPUP "&Convert Line Endings to"
+ POPUP "&\xC7\xE0\xEC\xE5\xED\xE8\xF2\xFC \xEF\xE5\xF0\xE5\xED\xEE\xF1\xFB \xF1\xF2\xF0\xEE\xEA \xED\xE0"
BEGIN
MENUITEM "&DOS (CRLF)", ID_EOL_TO_DOS
MENUITEM "&UNIX (LF)", ID_EOL_TO_UNIX
@@ -360,7 +360,7 @@
MENUITEM "&\xCA\xEE\xEF\xE8\xF0\xEE\xE2\xE0\xF2\xFC\tCtrl+C", ID_EDIT_COPY
MENUITEM "&\xC2\xF1\xF2\xE0\xE2\xE8\xF2\xFC\tCtrl+V", ID_EDIT_PASTE
MENUITEM SEPARATOR
- MENUITEM "Select Line &Difference\tF4", ID_SELECTLINEDIFF
+ MENUITEM "\xC2\xFB\xE1\xF0\xE0\xF2\xFC \xEE\xF2\xEB\xE8\xF7\xE8\xE5\tF4", ID_SELECTLINEDIFF
MENUITEM "\xC2&\xFB\xE1\xF0\xE0\xF2\xFC \xC2\xF1\xE5\tCtrl+A", ID_EDIT_SELECT_ALL
MENUITEM SEPARATOR
MENUITEM "&\xCD\xE0\xE9\xF2\xE8...\tCtrl+F", ID_EDIT_FIND
@@ -368,7 +368,7 @@
MENUITEM SEPARATOR
POPUP "&\xD1\xEA\xF0\xE8\xEF\xF2\xFB"
BEGIN
- MENUITEM "< Empty >", ID_NO_EDIT_SCRIPTS
+ MENUITEM "< \xCD\xE5\xF2 >", ID_NO_EDIT_SCRIPTS
END
MENUITEM SEPARATOR
POPUP "&\xC4\xEE\xEF\xEE\xEB\xED\xE8\xF2\xE5\xEB\xFC\xED\xEE"
@@ -376,12 +376,12 @@
MENUITEM "&\xCA\xEE\xEF\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xF1 \xED\xF3\xEC\xE5\xF0\xE0\xF6\xE8\xE5\xE9 \xF1\xF2\xF0\xEE\xEA\tCtrl+Shift+C",
ID_EDIT_COPY_LINENUMBERS
END
- POPUP "&Bookmarks"
+ POPUP "&\xC7\xE0\xEA\xEB\xE0\xE4\xEA\xE8"
BEGIN
- MENUITEM "&Toggle Bookmark\tCtrl+F2", ID_EDIT_TOGGLE_BOOKMARK
- MENUITEM "&Next Bookmark\tF2", ID_EDIT_GOTO_NEXT_BOOKMARK
- MENUITEM "&Previous bookmark\tShift+F2", ID_EDIT_GOTO_PREV_BOOKMARK
- MENUITEM "&Clear All Bookmarks", ID_EDIT_CLEAR_ALL_BOOKMARKS
+ MENUITEM "&\xC7\xE0\xEA\xEB\xE0\xE4\xEA\xE0\tCtrl+F2", ID_EDIT_TOGGLE_BOOKMARK
+ MENUITEM "&\xD1\xEB\xE5\xE4\xF3\xFE\xF9\xE0\xFF \xE7\xE0\xEA\xEB\xE0\xE4\xEA\xE0\tF2", ID_EDIT_GOTO_NEXT_BOOKMARK
+ MENUITEM "&\xCF\xF0\xE5\xE4\xFB\xE4\xF3\xF9\xE0\xFF \xE7\xE0\xEA\xEB\xE0\xE4\xEA\xE0\tShift+F2", ID_EDIT_GOTO_PREV_BOOKMARK
+ MENUITEM "&\xD3\xE4\xE0\xEB\xE8\xF2\xFC \xE2\xF1\xE5 \xE7\xE0\xEA\xEB\xE0\xE4\xEA\xE8", ID_EDIT_CLEAR_ALL_BOOKMARKS
END
MENUITEM "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xEA \xF1\xF2\xF0\xEE\xEA\xE5...\tCtrl+G", ID_EDIT_WMGOTO
MENUITEM SEPARATOR
@@ -396,15 +396,15 @@
MENUITEM SEPARATOR
MENUITEM "\xCF\xEE\xEA\xE0\xE7\xFB&\xE2\xE0\xF2\xFC \xED\xE5\xE2\xE8\xE4\xE8\xEC\xFB\xE5", ID_VIEW_WHITESPACE
MENUITEM "\xCF\xEE\xEA\xE0\xE7\xFB\xE2\xE0\xF2\xFC \xEE\xF2\xEB\xE8\xF7\xE8\xFF \xE2 \xF1\xF2\xF0\xEE\xEA\xE0\xF5", ID_VIEW_LINEDIFFS
- MENUITEM "View Line &Numbers", ID_VIEW_LINENUMBERS
- MENUITEM "W&rap Lines", ID_VIEW_WORDWRAP
+ MENUITEM "\xCF\xEE\xEA\xE0\xE7\xFB\xE2\xE0\xF2\xFC \xED\xEE\xEC\xE5\xF0\xE0 \xF1\xF2\xF0\xEE\xEA", ID_VIEW_LINENUMBERS
+ MENUITEM "\xCF\xE5\xF0\xE5\xED\xEE\xF1 \xEF\xEE \xF1\xEB\xEE\xE2\xE0\xEC", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
- MENUITEM "Sw&ap Panes", ID_VIEW_SWAPPANES
+ MENUITEM "\xCF\xEE\xEC\xE5\xED\xFF\xF2\xFC \xEF\xE0\xED\xE5\xEB\xE8 \xEC\xE5\xF1\xF2\xE0\xEC\xE8", ID_VIEW_SWAPPANES
MENUITEM SEPARATOR
MENUITEM "\xCF\xE0&\xED\xE5\xEB\xFC \xE8\xED\xF1\xF2\xF0\xF3\xEC\xE5\xED\xF2\xEE\xE2", ID_VIEW_TOOLBAR
MENUITEM "&\xD1\xF2\xF0\xEE\xEA\xE0 \xF1\xEE\xF1\xF2\xEE\xFF\xED\xE8\xFF", ID_VIEW_STATUS_BAR
MENUITEM "\xCF\xE0\xED\xE5&\xEB\xFC \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xFF", ID_VIEW_DETAIL_BAR
- MENUITEM "\xCF\xE0\xED\xE5\xEB\xFC \xEB\xEE\xEA\xE0&\xF6\xE8\xE9", ID_VIEW_LOCATION_BAR
+ MENUITEM "\xCF\xE0\xED\xE5\xEB\xFC \xEC\xE5\xF1\xF2\xEE\xEF\xEE\xEB\xEE\xE6\xE5\xED\xE8\xE9", ID_VIEW_LOCATION_BAR
MENUITEM SEPARATOR
MENUITEM "&\xDF\xE7\xFB\xEA...", ID_VIEW_LANGUAGE
END
@@ -451,8 +451,8 @@
END
POPUP "&\xCE\xEA\xED\xEE"
BEGIN
- MENUITEM "\xC7\xE0\xEA\xF0\xFB\xF2\xFC", ID_FILE_CLOSE
- MENUITEM "Clo&se All", ID_WINDOW_CLOSEALL
+ MENUITEM "&\xC7\xE0\xEA\xF0\xFB\xF2\xFC", ID_FILE_CLOSE
+ MENUITEM "\xC7\xE0\xEA\xF0\xFB\xF2\xFC &\xE2\xF1\xE5", ID_WINDOW_CLOSEALL
MENUITEM SEPARATOR
MENUITEM "\xCF\xE5\xF0\xE5\xEA\xEB\xFE\xF7\xE8\xF2\xFC &\xCE\xEA\xED\xEE\tF6", ID_WINDOW_CHANGE_PANE
MENUITEM SEPARATOR
@@ -463,13 +463,13 @@
POPUP "&\xCF\xEE\xEC\xEE\xF9\xFC"
BEGIN
MENUITEM "&\xD1\xEE\xE4\xE5\xF0\xE6\xE0\xED\xE8\xE5...\tF1", ID_HELP_CONTENTS
- MENUITEM "&Index...", ID_HELP_INDEX
- MENUITEM "&Search...", ID_HELP_SEARCH
+ MENUITEM "&\xC8\xED\xE4\xE5\xEA\xF1...", ID_HELP_INDEX
+ MENUITEM "&\xCF\xEE\xE8\xF1\xEA...", ID_HELP_SEARCH
MENUITEM SEPARATOR
- MENUITEM "\xCA\xEE\xED\xF4\xE8\xE3\xF3\xF0\xE0\xF6\xE8\xFF...", ID_HELP_GETCONFIG
- MENUITEM "&\xCF\xEE\xE4\xE4\xE5\xF0\xE6\xEA\xE0 \xE0\xF0\xF5\xE8\xE2\xEE\xE2 \xEE\xF2\xEA\xEB\xFE\xF7\xE5\xED\xE0...", ID_HELP_MERGE7ZMISMATCH
+ MENUITEM "&\xCA\xEE\xED\xF4\xE8\xE3\xF3\xF0\xE0\xF6\xE8\xFF...", ID_HELP_GETCONFIG
+ MENUITEM "\xCF\xEE\xE4\xE4\xE5\xF0\xE6\xEA\xE0 &\xE0\xF0\xF5\xE8\xE2\xEE\xE2 \xEE\xF2\xEA\xEB\xFE\xF7\xE5\xED\xE0...", ID_HELP_MERGE7ZMISMATCH
MENUITEM SEPARATOR
- MENUITEM "GNU Public License...", ID_HELP_GNULICENSE
+ MENUITEM "GNU &Public License...", ID_HELP_GNULICENSE
MENUITEM "&\xCE \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xEC\xE5 WinMerge...", ID_APP_ABOUT
END
END
@@ -478,7 +478,7 @@
BEGIN
POPUP "_ITEM_POPUP_"
BEGIN
- MENUITEM "Comp&are", ID_MERGE_COMPARE
+ MENUITEM "\xD1&\xF0\xE0\xE2\xED\xE8\xF2\xFC", ID_MERGE_COMPARE
MENUITEM SEPARATOR
POPUP "\xCA\xEE\xEF\xE8\xF0\xEE\xE2\xE0\xF2\xFC"
BEGIN
@@ -498,8 +498,8 @@
MENUITEM "\xD1\xEF\xF0\xE0\xE2\xE0", ID_DIR_DEL_RIGHT
MENUITEM "\xCE\xE1\xE0", ID_DIR_DEL_BOTH
END
- MENUITEM "Re&name", ID_DIR_ITEM_RENAME
- MENUITEM "&Hide Items", ID_DIR_HIDE_FILENAMES
+ MENUITEM "&\xCF\xE5\xF0\xE5\xE8\xEC\xE5\xED\xEE\xE2\xE0\xF2\xFC", ID_DIR_ITEM_RENAME
+ MENUITEM "&\xD1\xEA\xF0\xFB\xF2\xFC", ID_DIR_HIDE_FILENAMES
MENUITEM SEPARATOR
POPUP "\xCE\xF2\xEA\xF0\xFB\xF2\xFC \xEB\xE5\xE2\xFB\xE9 \xF4\xE0\xE9\xEB"
BEGIN
@@ -514,23 +514,23 @@
MENUITEM "\xD1 \xEF\xEE\xEC\xEE\xF9\xFC\xFE...", ID_DIR_OPEN_RIGHT_WITH
END
MENUITEM SEPARATOR
- POPUP "Cop&y Pathnames"
+ POPUP "\xD1\xEA\xEE\xEF\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xEF\xF3\xF2\xE8"
BEGIN
- MENUITEM "&Left (%1 of %2)", ID_DIR_COPY_PATHNAMES_LEFT
- MENUITEM "&Right (%1 of %2)", ID_DIR_COPY_PATHNAMES_RIGHT
- MENUITEM "&Both (%1 of %2)", ID_DIR_COPY_PATHNAMES_BOTH
+ MENUITEM "\xD1&\xEB\xE5\xE2\xE0 (%1 \xE8\xE7 %2)", ID_DIR_COPY_PATHNAMES_LEFT
+ MENUITEM "\xD1&\xEF\xF0\xE0\xE2\xE0 (%1 \xE8\xE7 %2)", ID_DIR_COPY_PATHNAMES_RIGHT
+ MENUITEM "\xCE&\xE1\xE0 (%1 \xE8\xE7 %2)", ID_DIR_COPY_PATHNAMES_BOTH
END
MENUITEM "\xD1\xEA\xEE\xEF\xE8\xF0\xEE\xE2\xE0\xF2\xFC &\xE8\xEC\xE5\xED\xE0 \xF4\xE0\xE9\xEB\xEE\xE2", ID_DIR_COPY_FILENAMES
MENUITEM SEPARATOR
- POPUP "&Zip"
+ POPUP "&\xC7\xE0\xE0\xF0\xF5\xE8\xE2\xE8\xF0\xEE\xE2\xE0\xF2\xFC"
BEGIN
- MENUITEM "&Left... (%1 of %2)", ID_DIR_ZIP_LEFT
- MENUITEM "&Right... (%1 of %2)", ID_DIR_ZIP_RIGHT
- MENUITEM "&Both... (%1 of %2)", ID_DIR_ZIP_BOTH
- MENUITEM "&Differences... (%1 of %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
+ MENUITEM "\xD1&\xEB\xE5\xE2\xE0... (%1 \xE8\xE7 %2)", ID_DIR_ZIP_LEFT
+ MENUITEM "\xD1&\xEF\xF0\xE0\xE2\xE0... (%1 \xE8\xE7 %2)", ID_DIR_ZIP_RIGHT
+ MENUITEM "\xCE&\xE1\xE0... (%1 \xE8\xE7 %2)", ID_DIR_ZIP_BOTH
+ MENUITEM "\xD2\xEE\xEB\xFC\xEA\xEE &\xEE\xF2\xEB\xE8\xF7\xE8\xFF... (%1 \xE8\xE7 %2)", ID_DIR_ZIP_BOTH_DIFFS_ONLY
END
MENUITEM SEPARATOR
- MENUITEM "&Refresh", ID_DIR_RESCAN
+ MENUITEM "&\xCE\xE1\xED\xEE\xE2\xE8\xF2\xFC", ID_DIR_RESCAN
END
POPUP "_HDR_POPUP_"
BEGIN
@@ -561,11 +561,11 @@
POPUP "_POPUP_"
BEGIN
MENUITEM "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xEA &\xEE\xF2\xEB\xE8\xF7\xE8\xFE", ID_LOCBAR_GOTODIFF
- MENUITEM "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xEA \xF1\xF2\xF0\xEE\xEA\xE5...", ID_EDIT_WMGOTO
+ MENUITEM "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xEA &\xF1\xF2\xF0\xEE\xEA\xE5...", ID_EDIT_WMGOTO
MENUITEM SEPARATOR
- MENUITEM "&No Moved Blocks", ID_DISPLAY_MOVED_NONE
- MENUITEM "&All Moved Blocks", ID_DISPLAY_MOVED_ALL
- MENUITEM "Moved Block for &Current Diff", ID_DISPLAY_MOVED_FOLLOW_DIFF
+ MENUITEM "&\xC1\xE5\xE7 \xEF\xE5\xF0\xE5\xEC\xE5\xF9\xE5\xED\xED\xFB\xF5 \xE1\xEB\xEE\xEA\xEE\xE2", ID_DISPLAY_MOVED_NONE
+ MENUITEM "&\xC2\xF1\xE5 \xEF\xE5\xF0\xE5\xEC\xE5\xF9\xE5\xED\xED\xFB\xE5 \xE1\xEB\xEE\xEA\xE8", ID_DISPLAY_MOVED_ALL
+ MENUITEM "\xCF\xE5\xF0\xE5\xEC\xE5\xF9. \xE1\xEB\xEE\xEA \xE4\xEB\xFF &\xE4\xE0\xED\xED\xEE\xE3\xEE \xEE\xF2\xEB\xE8\xF7\xE8\xFF", ID_DISPLAY_MOVED_FOLLOW_DIFF
END
END
@@ -643,13 +643,13 @@
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,95,209,1
LTEXT "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8
DEFPUSHBUTTON "OK",IDOK,166,103,50,14
- PUSHBUTTON "Contributors",IDC_OPEN_CONTRIBUTORS,7,103,65,14
+ PUSHBUTTON "\xC4\xE0\xF0\xE8\xF2\xE5\xEB\xE8",IDC_OPEN_CONTRIBUTORS,7,103,65,14
END
IDD_OPEN DIALOGEX 0, 0, 374, 126
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU | WS_THICKFRAME
-CAPTION "\xC2\xFB\xE1\xE5\xF0\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xFB \xE8\xEB\xE8 \xEA\xE0\xF2\xE0\xEB\xEE\xE3\xE8..."
+CAPTION "\xC2\xFB\xE1\xE5\xF0\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xFB \xE8\xEB\xE8 \xEF\xE0\xEF\xEA\xE8..."
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
RTEXT "&\xCB\xE5\xE2\xFB\xE9:",IDC_STATIC,13,24,65,8
@@ -675,8 +675,8 @@
LTEXT "\xD1\xF2\xE0\xF2\xF3\xF1:",IDC_OPEN_STATUS,15,102,192,8
DEFPUSHBUTTON "OK",IDOK,316,11,50,14
PUSHBUTTON "\xCE\xF2\xEC\xE5\xED\xE0",IDCANCEL,316,28,50,14
- PUSHBUTTON "Help",ID_HELP,316,45,50,14
- GROUPBOX "\xD4\xE0\xE9\xEB\xFB \xE8\xEB\xE8 \xEA\xE0\xF2\xE0\xEB\xEE\xE3\xE8 \xE4\xEB\xFF \xF1\xF0\xE0\xE2\xED\xE8\xE2\xE0\xED\xE8\xFF",IDC_FILES_DIRS_GROUP,7,
+ PUSHBUTTON "\xCF\xEE\xEC\xEE\xF9\xFC",ID_HELP,316,45,50,14
+ GROUPBOX "\xD4\xE0\xE9\xEB\xFB \xE8\xEB\xE8 \xEF\xE0\xEF\xEA\xE8 \xE4\xEB\xFF \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xFF",IDC_FILES_DIRS_GROUP,7,
7,302,111
END
@@ -748,7 +748,7 @@
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
CONTROL "\xD1\xF0\xE0\xE2\xED\xE5\xED\xE8\xFF &\xF4\xE0\xE9\xEB\xEE\xE2",IDC_MULTIDOC_FILECMP,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
- LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
+ LTEXT "WinMerge \xED\xE5 \xEF\xEE\xEA\xE0\xE7\xFB\xE2\xE0\xE5\xF2 \xED\xE5\xEA\xEE\xF2\xEE\xF0\xFB\xE5 \xF1\xEE\xEE\xE1\xF9\xE5\xED\xE8\xFF. \xCD\xE0\xE6\xEC\xE8\xF2\xE5 \xD1\xE1\xF0\xEE\xF1, \xF7\xF2\xEE\xE1\xFB \xEF\xEE\xEA\xE0\xE7\xFB\xE2\xE0\xEB\xE8\xF1\xFC \xE2\xF1\xE5 \xF1\xEE\xEE\xE1\xF9\xE5\xED\xE8\xFF.",
IDC_STATIC,7,153,168,31
PUSHBUTTON "\xD1\xE1\xF0\xEE\xF1",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
WS_TABSTOP
@@ -836,7 +836,7 @@
EDITTEXT IDC_COMMENTS,18,21,243,56,ES_MULTILINE | ES_AUTOVSCROLL |
ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
LTEXT "\xCA\xEE\xEC\xEC\xE5\xED\xF2\xE0\xF0\xE8\xE8",IDC_STATIC,18,7,80,10
- CONTROL "Apply to all items",IDC_MULTI_CHECKOUT,"Button",
+ CONTROL "\xCF\xF0\xE8\xEC\xE5\xED\xE8\xF2\xFC \xEA\xEE \xE2\xF1\xE5\xEC",IDC_MULTI_CHECKOUT,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,83,235,8
CONTROL "CheckIn after checkout",IDC_CHECKIN,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,93,235,8
@@ -847,7 +847,7 @@
CAPTION "\xD1\xF2\xF0\xEE\xEA\xEE\xE2\xFB\xE5 \xF4\xE8\xEB\xFC\xF2\xF0\xFB"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "\xCF\xF0\xEE\xEF\xF3\xF1\xEA\xE0\xF2\xFC \xF1\xF2\xF0\xEE\xEA\xE8, \xF3\xE4\xEE\xE2\xEB\xE5\xF2\xE2\xEE\xF0\xFF\xFE\xF9\xE8\xE5 \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE8\xEC \xF8\xE0\xE1\xEB\xEE\xED\xE0\xEC",
+ CONTROL "\xD0\xE0\xE7\xF0\xE5\xF8\xE8\xF2\xFC \xF1\xF2\xF0\xEE\xEA\xEE\xE2\xFB\xE5 \xF4\xE8\xEB\xFC\xF2\xF0\xFB",
IDC_IGNOREREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
7,224,15
LTEXT "\xD0\xE5\xE3\xF3\xEB\xFF\xF0\xED\xFB\xE5 \xE2\xFB\xF0\xE0\xE6\xE5\xED\xE8\xFF (\xEE\xE4\xED\xEE \xED\xE0 \xF1\xF2\xF0\xEE\xEA\xF3):",IDC_STATIC,7,28,
@@ -952,19 +952,19 @@
CONTROL "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xF0\xE0\xE7\xED\xE8\xF6\xF3 \xE2\xF0\xE5\xEC\xE5\xED\xE8 \xEC\xE5\xED\xE5\xE5 3 \xF1\xE5\xEA\xF3\xED\xE4",
IDC_IGNORE_SMALLTIMEDIFF,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,17,222,10
- GROUPBOX "Integration",IDC_STATIC,7,30,218,46
+ GROUPBOX "\xC8\xED\xF2\xE5\xE3\xF0\xE0\xF6\xE8\xFF",IDC_STATIC,7,30,218,46
CONTROL "\xC4\xEE\xE1\xE0\xE2\xE8\xF2\xFC \xE2 &\xEA\xEE\xED\xF2\xE5\xEA\xF1\xF2\xED\xEE\xE5 \xEC\xE5\xED\xFE \xEF\xF0\xEE\xE2\xEE\xE4\xED\xE8\xEA\xE0",IDC_EXPLORER_CONTEXT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,41,200,10
CONTROL "\xC2&\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xF0\xE0\xF1\xF8\xE8\xF0\xE5\xED\xED\xEE\xE5 \xEC\xE5\xED\xFE",IDC_EXPLORER_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,51,200,10
- CONTROL "In&clude subfolders by default",IDC_EXPLORER_SUBFOLDERS,
+ CONTROL "\xCE\xE1\xF0\xE0\xE1\xE0\xF2\xFB\xE2\xE0\xF2\xFC \xEF\xEE\xE4\xEF\xE0\xEF\xEA\xE8 \xEF\xEE \xF3\xEC\xEE\xEB\xF7\xE0\xED\xE8\xFE",IDC_EXPLORER_SUBFOLDERS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,61,200,10
LTEXT "\xC2\xED\xE5\xF8\xED\xE8\xE9 \xF0\xE5\xE4\xE0\xEA\xF2\xEE\xF0:",IDC_STATIC,7,83,222,8
EDITTEXT IDC_EXT_EDITOR_PATH,7,93,167,14,ES_AUTOHSCROLL
PUSHBUTTON "\xCE\xE1\xE7\xEE\xF0...",IDC_EXT_EDITOR_BROWSE,179,93,50,14
- LTEXT "&Filter folder:",IDC_STATIC,7,111,166,8
+ LTEXT "&\xD4\xE8\xEB\xFC\xF2\xF0\xFB:",IDC_STATIC,7,111,166,8
EDITTEXT IDC_FILTER_USER_PATH,7,121,167,14,ES_AUTOHSCROLL
- PUSHBUTTON "Browse...",IDC_FILTER_USER_BROWSE,179,121,50,14
+ PUSHBUTTON "\xCE\xE1\xE7\xEE\xF0...",IDC_FILTER_USER_BROWSE,179,121,50,14
END
IDD_GENERATE_PATCH DIALOGEX 0, 0, 340, 180
@@ -1046,7 +1046,7 @@
EDITTEXT IDC_COLDLG_DESC,7,115,294,22,ES_MULTILINE | ES_READONLY
PUSHBUTTON "\xD1\xE1\xF0\xEE\xF1\xE8\xF2\xFC",IDC_COLDLG_DEFAULTS,7,143,50,14
DEFPUSHBUTTON "OK",IDOK,197,143,50,14
- PUSHBUTTON "\xCE\xF2\xEC\xE5\xED\xFB",IDCANCEL,251,143,50,14
+ PUSHBUTTON "\xCE\xF2\xEC\xE5\xED\xE0",IDCANCEL,251,143,50,14
END
IDD_SELECTUNPACKER DIALOGEX 0, 0, 278, 102
@@ -1075,17 +1075,17 @@
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
WS_CAPTION
EXSTYLE WS_EX_TOOLWINDOW
-CAPTION " Folder Compare Progress"
+CAPTION " \xD1\xF0\xE0\xE2\xED\xE5\xED\xE8\xE5 \xEF\xE0\xEF\xEE\xEA"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,167,15,83,14
+ DEFPUSHBUTTON "\xCE\xF1\xF2\xE0\xED\xEE\xE2\xE8\xF2\xFC",IDC_COMPARISON_STOP,167,15,83,14
CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,9,
44,241,9
RTEXT "0",IDC_ITEMSCOMPARED,95,29,30,8
RTEXT "0",IDC_ITEMSTOTAL,95,19,30,8
- LTEXT "Comparing items...",IDC_STATIC,7,7,150,8
- LTEXT "Items compared:",IDC_STATIC,7,29,85,8
- LTEXT "Items total:",IDC_STATIC,7,19,85,8
+ LTEXT "\xC8\xE4\xE5\xF2 \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xE5...",IDC_STATIC,7,7,150,8
+ LTEXT "\xCE\xE1\xF0\xE0\xE1\xEE\xF2\xE0\xED\xEE:",IDC_STATIC,7,29,85,8
+ LTEXT "\xC2\xF1\xE5\xE3\xEE:",IDC_STATIC,7,19,85,8
END
IDD_WMGOTO DIALOGEX 0, 0, 210, 70
@@ -1136,8 +1136,8 @@
WS_VSCROLL | WS_TABSTOP
CONTROL "&\xCE\xF1\xF2\xE0\xED\xE0\xE2\xEB\xE8\xE2\xE0\xF2\xFC\xF1\xFF \xEF\xEE\xF1\xEB\xE5 \xEF\xE5\xF0\xE2\xEE\xE3\xEE \xEE\xF2\xEB\xE8\xF7\xE8\xFF",IDC_COMPARE_STOPFIRST,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10
- GROUPBOX "Comments",IDC_STATIC,7,134,221,32
- CONTROL "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button",
+ GROUPBOX "\xCA\xEE\xEC\xEC\xE5\xED\xF2\xE0\xF0\xE8\xE8",IDC_STATIC,7,134,221,32
+ CONTROL "\xD4\xE8\xEB\xFC\xF2\xF0 \xEA\xEE\xEC\xEC\xE5\xED\xF2\xE0\xF0\xE8\xE5\xE2",IDC_FILTERCOMMENTS_CHECK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
PUSHBUTTON "\xCF\xEE \xF3\xEC\xEE\xEB\xF7\xE0\xED\xE8\xFE",IDC_COMPARE_DEFAULTS,7,179,61,14
END
@@ -1161,13 +1161,13 @@
BS_AUTORADIOBUTTON | WS_GROUP,95,53,127,10
CONTROL "&\xCF\xF0\xEE\xE1\xE5\xEB\xFB",IDC_PROP_INSERT_SPACES,"Button",
BS_AUTORADIOBUTTON,95,62,127,10
- GROUPBOX "\xCF\xEE\xE4\xEA\xF0\xE0\xF8\xE8\xE2\xE0\xED\xE8\xE5 \xEE\xF2\xEB\xE8\xF7\xE8\xE9 \xE2 \xF1\xF2\xF0\xEE\xEA\xE5",IDC_LINE_COLORING_GROUP,7,87,
+ GROUPBOX "\xCF\xEE\xE4\xF1\xE2\xE5\xF2\xEA\xE0 \xEE\xF2\xEB\xE8\xF7\xE8\xE9 \xE2 \xF1\xF2\xF0\xEE\xEA\xE5",IDC_LINE_COLORING_GROUP,7,87,
221,61
CONTROL "\xCF\xEE\xEA\xE0\xE7\xFB\xE2\xE0\xF2\xFC \xEE\xF2\xEB\xE8\xF7\xE8\xFF \xE2 \xF1\xF2\xF0\xEE\xEA\xE5",IDC_VIEW_LINE_DIFFERENCES,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,14,98,100,8
- CONTROL "&Character level",IDC_EDITOR_CHARLEVEL,"Button",
+ CONTROL "\xCF\xEE\xF1\xE8\xEC\xE2\xEE\xEB\xFC\xED\xEE",IDC_EDITOR_CHARLEVEL,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,14,108,138,10
- CONTROL "&Word-level:",IDC_EDITOR_WORDLEVEL,"Button",
+ CONTROL "\xCF\xEE \xF1\xEB\xEE\xE2\xE0\xEC:",IDC_EDITOR_WORDLEVEL,"Button",
BS_AUTORADIOBUTTON,14,118,122,10
COMBOBOX IDC_BREAK_TYPE,24,130,143,34,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_GROUP | WS_TABSTOP
@@ -1188,8 +1188,8 @@
CONTROL "List1",IDC_FILTERFILE_LIST,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER |
WS_BORDER | WS_TABSTOP,7,7,342,100
- PUSHBUTTON "Test",IDC_FILTERFILE_TEST_BTN,7,114,50,14
- PUSHBUTTON "Install...",IDC_FILTERFILE_INSTALL,137,114,50,14
+ PUSHBUTTON "\xD2\xE5\xF1\xF2",IDC_FILTERFILE_TEST_BTN,7,114,50,14
+ PUSHBUTTON "\xD3\xF1\xF2\xE0\xED\xEE\xE2\xE8\xF2\xFC...",IDC_FILTERFILE_INSTALL,137,114,50,14
PUSHBUTTON "\xCD\xEE\xE2\xFB\xE9...",IDC_FILTERFILE_NEWBTN,192,114,50,14
PUSHBUTTON "\xC8\xE7\xEC\xE5\xED\xE8\xF2\xFC...",IDC_FILTERFILE_EDITBTN,246,114,50,14
PUSHBUTTON "\xD3\xE4\xE0\xEB\xE8\xF2\xFC...",IDC_FILTERFILE_DELETEBTN,300,114,50,14
@@ -1225,10 +1225,10 @@
CAPTION "\xCA\xEE\xE4\xEE\xE2\xE0\xFF \xF1\xF2\xF0\xE0\xED\xE8\xF6\xE0"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- GROUPBOX "\xCA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0 \xEF\xEE \xF3\xEC\xEE\xEB\xF7\xE0\xED\xE8\xFE",IDC_STATIC,7,7,221,79
- LTEXT "\xC2\xFB\xE1\xE5\xF0\xE8\xF2\xE5 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xF3 \xEF\xEE \xF3\xEC\xEE\xEB\xF7\xE0\xED\xE8\xFE, \xE4\xEB\xFF \xED\xE5 \xDE\xED\xE8\xEA\xEE\xE4-\xF4\xE0\xE9\xEB\xEE\xE2:",
+ GROUPBOX "\xCA\xEE\xE4\xEE\xE2\xE0\xFF \xF1\xF2\xF0\xE0\xED\xE8\xF6\xE0 \xEF\xEE \xF3\xEC\xEE\xEB\xF7\xE0\xED\xE8\xFE",IDC_STATIC,7,7,221,79
+ LTEXT "\xC2\xFB\xE1\xE5\xF0\xE8\xF2\xE5 \xEA\xEE\xE4\xEE\xE2\xF3\xFE \xF1\xF2\xF0\xE0\xED\xE8\xF6\xF3 \xEF\xEE \xF3\xEC\xEE\xEB\xF7\xE0\xED\xE8\xFE, \xE4\xEB\xFF \xED\xE5 \xDE\xED\xE8\xEA\xEE\xE4-\xF4\xE0\xE9\xEB\xEE\xE2:",
IDC_STATIC,14,20,208,19
- CONTROL "\xCE\xEF\xF0\xE5\xE4\xE5\xEB\xFF\xF2\xFC \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xF3 \xE4\xEB\xFF \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE8\xF5 \xF4\xE0\xE9\xEB\xEE\xE2 : .html, .rc, .xml \nneed to restart session",
+ CONTROL "\xCE\xEF\xF0\xE5\xE4\xE5\xEB\xFF\xF2\xFC \xEA\xEE\xE4\xEE\xE2\xF3\xFE \xF1\xF2\xF0\xE0\xED\xE8\xF6\xF3 \xE4\xEB\xFF \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE8\xF5 \xF4\xE0\xE9\xEB\xEE\xE2 : .html, .rc, .xml \n\xED\xF3\xE6\xED\xEE \xEE\xF2\xEA\xF0\xFB\xF2\xFC \xF4\xE0\xE9\xEB \xE7\xE0\xED\xEE\xE2\xEE",
IDC_DETECT_CODEPAGE,"Button",BS_AUTOCHECKBOX | BS_TOP |
BS_MULTILINE | WS_TABSTOP,13,92,210,29
CONTROL "\xD1\xE8\xF1\xF2\xE5\xEC\xED\xE0\xFF \xEA\xEE\xE4\xEE\xE2\xE0\xFF \xF1\xF2\xF0\xE0\xED\xE8\xF6\xE0",IDC_CP_SYSTEM,"Button",
@@ -1249,11 +1249,11 @@
LTEXT "\xCD\xE5\xE2\xEE\xE7\xEC\xEE\xE6\xED\xEE \xEE\xEF\xF0\xE5\xE4\xE5\xEB\xE8\xF2\xFC \xE2\xE5\xF0\xF1\xE8\xFE 7-Zip (\xED\xE5 \xF3\xF1\xF2\xE0\xED\xEE\xE2\xEB\xE5\xED?)",107,2,
2,296,18
CONTROL "",IDC_STATIC,"Static",SS_GRAYRECT,2,22,296,1
- LTEXT "\xC4\xEB\xFF \xF0\xE0\xE1\xEE\xF2\xFB \xF1 \xE0\xF0\xF5\xE8\xE2\xE0\xEC\xE8, \xF2\xF0\xE5\xE1\xF3\xE5\xF2\xF1\xFF \xF3\xF1\xF2\xE0\xED\xEE\xE2\xEB\xE5\xED\xED\xFB\xE9 \xED\xE0 \xE2\xE0\xF8\xE5\xE9 \xEC\xE0\xF8\xE8\xED\xE5 7-Zip \xE2\xE5\xF0\xF1\xE8\xE9 3.11 \xE8 \xE2\xFB\xF8\xE5, \xE8\xEB\xE8 \xED\xE5\xEE\xF2\xFA\xE5\xEC\xEB\xE5\xEC\xFB\xE5 \xEA\xEE\xEC\xEF\xEE\xED\xE5\xED\xF2\xFB \xE4\xEE\xEB\xE6\xED\xFB \xE1\xFB\xF2\xFC \xF1\xEA\xEE\xEF\xE8\xF0\xEE\xE2\xE0\xED\xFB \xE2 \xEF\xE0\xEF\xEA\xF3 \xF1 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xEC\xEE\xE9 \xE4\xEB\xFF \xED\xE5\xE7\xE0\xE2\xE8\xF1\xE8\xEC\xFB\xF5 \xEE\xEF\xE5\xF0\xE0\xF6\xE8\xE9.",
+ LTEXT "\xC4\xEB\xFF \xF0\xE0\xE1\xEE\xF2\xFB \xF1 \xE0\xF0\xF5\xE8\xE2\xE0\xEC\xE8 \xF2\xF0\xE5\xE1\xF3\xE5\xF2\xF1\xFF \xEB\xE8\xE1\xEE \xF3\xF1\xF2\xE0\xED\xEE\xE2\xEB\xE5\xED\xED\xFB\xE9 7-Zip \xE2\xE5\xF0\xF1\xE8\xE9 3.11 \xE8 \xE2\xFB\xF8\xE5, \xEB\xE8\xE1\xEE \xE5\xE3\xEE \xEA\xEE\xEC\xEF\xEE\xED\xE5\xED\xF2\xFB \xE2 \xEF\xE0\xEF\xEA\xE5 \xF1 WinMerge.",
IDC_STATIC,2,26,296,26
- LTEXT "\xC0 \xF2\xE0\xEA \xE6\xE5, \xEB\xFE\xE1\xFB\xEC \xF1\xEF\xEE\xF1\xEE\xE1\xEE\xEC \xE4\xEE\xEB\xE6\xE5\xED \xE1\xFB\xF2\xFC \xE4\xEE\xF1\xF2\xF3\xEF\xE5\xED \xE8\xED\xF2\xE5\xF0\xF4\xE5\xE9\xF1\xED\xFB\xE9 \xEF\xEB\xE0\xE3\xE8\xED (Merge7z*.dll)",
+ LTEXT "\xD2\xE0\xEA \xE6\xE5 \xF2\xF0\xE5\xE1\xF3\xE5\xF2\xF1\xFF \xEF\xEB\xE0\xE3\xE8\xED (Merge7z*.dll)",
IDC_STATIC,2,52,296,18
- LTEXT "\xCF\xEE\xE6\xE0\xEB\xF3\xE9\xF1\xF2\xE0, \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xF3\xE9\xF2\xE5 \xF0\xE5\xEA\xEE\xEC\xE5\xED\xE4\xF3\xE5\xEC\xF3\xFE \xED\xE8\xE6\xE5 \xE2\xE5\xF0\xF1\xE8\xFE 7-Zip \xEF\xEE\xEA\xE0 \xED\xE5 \xEF\xEE\xFF\xE2\xFF\xF2\xFC\xF1\xFF \xE8\xED\xF2\xE5\xF0\xF4\xE5\xE9\xF1\xED\xFB\xE5 \xEF\xEB\xE0\xE3\xE8\xED\xFB \xE4\xEB\xFF \xF1\xE2\xE5\xE6\xE8\xF5 \xE2\xE5\xF0\xF1\xE8\xE9",
+ LTEXT "\xD0\xE5\xEA\xEE\xEC\xE5\xED\xE4\xF3\xE5\xF2\xF1\xFF \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xF3\xFE \xE2\xE5\xF0\xF1\xE8\xFE 7-Zip",
IDC_STATIC,2,70,296,26
CTEXT "\xC2\xE5\xF0\xF1\xE8\xFF",IDC_STATIC,146,98,56,20,SS_CENTERIMAGE |
SS_SUNKEN
@@ -1271,7 +1271,7 @@
CTEXT "\xEF\xF3\xF1\xF2\xEE",120,146,132,56,10,SS_CENTERIMAGE | SS_SUNKEN
CTEXT "",121,204,132,58,10,SS_CENTERIMAGE | SS_SUNKEN
CTEXT "\xEE\xF2\xF1\xF3\xF2\xF1\xF2\xE2.",122,264,132,34,10,SS_CENTERIMAGE | SS_SUNKEN
- LTEXT "\xCA\xEE\xEC\xEF\xEE\xED\xE5\xED\xF2\xFB 7-Zip \xE4\xEB\xFF \xF1\xE0\xEC\xEE\xF1\xF2\xEE\xFF\xF2\xE5\xEB\xFC\xED\xFB\xF5 \xEE\xEF\xE5\xF0\xE0\xF6\xE8\xE9:",IDC_STATIC,
+ LTEXT "\xCA\xEE\xEC\xEF\xEE\xED\xE5\xED\xF2\xFB 7-Zip \xE2 \xEF\xE0\xEF\xEA\xE5 \xF1 WinMerge:",IDC_STATIC,
2,144,142,10,SS_CENTERIMAGE
CTEXT "\xEF\xF3\xF1\xF2\xEE",130,146,144,56,10,SS_CENTERIMAGE | SS_SUNKEN
CTEXT "",131,204,144,58,10,SS_CENTERIMAGE | SS_SUNKEN
@@ -1290,7 +1290,7 @@
IDD_PREFERENCES DIALOGEX 0, 0, 352, 260
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Options"
+CAPTION "\xCD\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE0"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "OK",IDOK,187,237,50,14
@@ -1303,8 +1303,8 @@
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,230,338,1
LTEXT " \xCA\xE0\xF2\xE5\xE3\xEE\xF0\xE8\xE8",IDC_STATIC,7,7,96,13,SS_CENTERIMAGE |
SS_SUNKEN
- PUSHBUTTON "Import...",IDC_TREEOPT_IMPORT,7,237,50,14
- PUSHBUTTON "Export...",IDC_TREEOPT_EXPORT,62,237,50,14
+ PUSHBUTTON "\xC8\xEC\xEF\xEE\xF0\xF2...",IDC_TREEOPT_IMPORT,7,237,50,14
+ PUSHBUTTON "\xDD\xEA\xF1\xEF\xEE\xF0\xF2...",IDC_TREEOPT_EXPORT,62,237,50,14
END
IDD_PROPPAGE_COLORS_SYNTAX DIALOGEX 0, 0, 235, 214
@@ -1383,7 +1383,7 @@
LTEXT "&\xD1\xF2\xE8\xEB\xFC:",IDC_STATIC,7,37,35,8
COMBOBOX IDC_REPORT_STYLECOMBO,46,35,158,70,CBS_DROPDOWNLIST |
CBS_SORT | WS_VSCROLL | WS_TABSTOP
- CONTROL "&Copy to Clipboard",IDC_REPORT_COPYCLIPBOARD,"Button",
+ CONTROL "\xCA\xEE\xEF\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xE2 \xE1\xF3\xF4\xE5\xF0 \xEE\xE1\xEC\xE5\xED\xE0",IDC_REPORT_COPYCLIPBOARD,"Button",
BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,7,53,133,10
DEFPUSHBUTTON "OK",IDOK,157,60,50,14
PUSHBUTTON "\xCE\xF2\xEC\xE5\xED\xE0",IDCANCEL,211,60,50,14
@@ -1391,14 +1391,14 @@
IDD_SHARED_FILTER DIALOGEX 0, 0, 250, 75
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
-CAPTION "Shared or Private Filter"
+CAPTION "\xCE\xE1\xF9\xE8\xE5 \xE8 \xEB\xE8\xF7\xED\xFB\xE5 \xF4\xE8\xEB\xFC\xF2\xF0\xFB"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "\xCA\xE0\xEA\xEE\xE9 \xF2\xE8\xEF \xF4\xE8\xEB\xFC\xF2\xF0\xE0 \xE2\xFB \xF5\xEE\xF2\xE8\xF2\xE5 \xF1\xEE\xE7\xE4\xE0\xF2\xFC?",IDC_STATIC,
14,7,229,11
CONTROL "\xCE\xE1\xF9\xE8\xE9 \xF4\xE8\xEB\xFC\xF2\xF0 (\xE4\xEB\xFF \xE2\xF1\xE5\xF5 \xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xE5\xEB\xE5\xE9 \xFD\xF2\xEE\xE9 \xEC\xE0\xF8\xE8\xED\xFB)",IDC_SHARED,"Button",
BS_AUTORADIOBUTTON,20,22,223,10
- CONTROL "\xD7\xE0\xF1\xF2\xED\xFB\xE9 \xF4\xE8\xEB\xFC\xF2\xF0 (\xF2\xEE\xEB\xFC\xEA\xEE \xE4\xEB\xFF \xF2\xE5\xEA\xF3\xF9\xE5\xE3\xEE \xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xE5\xEB\xFF)",IDC_PRIVATE,"Button",
+ CONTROL "\xCB\xE8\xF7\xED\xFB\xE9 \xF4\xE8\xEB\xFC\xF2\xF0 (\xF2\xEE\xEB\xFC\xEA\xEE \xE4\xEB\xFF \xF2\xE5\xEA\xF3\xF9\xE5\xE3\xEE \xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xE5\xEB\xFF)",IDC_PRIVATE,"Button",
BS_AUTORADIOBUTTON,20,37,223,10
DEFPUSHBUTTON "OK",IDOK,65,55,50,14
PUSHBUTTON "\xCE\xF2\xEC\xE5\xED\xE0",IDCANCEL,135,55,50,14
@@ -1406,7 +1406,7 @@
IDD_PROP_ARCHIVE DIALOGEX 0, 0, 235, 126
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
-CAPTION "Archive Support"
+CAPTION "\xCF\xEE\xE4\xE4\xE5\xF0\xE6\xEA\xE0 \xE0\xF0\xF5\xE8\xE2\xEE\xE2"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "\xCF\xEE\xE4\xE4\xE5\xF0\xE6\xEA\xE0 \xE0\xF0\xF5\xE8\xE2\xEE\xE2 \xF2\xF0\xE5\xE1\xF3\xE5\xF2 \xED\xE0\xEB\xE8\xF7\xE8\xE5 \xEF\xEB\xE0\xE3\xE8\xED\xE0 7-Zip:",
@@ -1427,90 +1427,90 @@
IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Compare Statistics"
+CAPTION "\xD1\xF0\xE0\xE2\xED\xE5\xED\xE8\xE5 \xF1\xF2\xE0\xF2\xE8\xF1\xF2\xE8\xEA\xE8"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "Folders:",IDC_STATIC,72,7,38,8
- LTEXT "Files:",IDC_STATIC,131,7,39,8
- GROUPBOX "Different",IDC_STATIC,7,15,186,40
- RTEXT "Text:",IDC_STATIC,11,26,56,8
+ LTEXT "\xCF\xE0\xEF\xEA\xE8:",IDC_STATIC,72,7,38,8
+ LTEXT "\xD4\xE0\xE9\xEB\xFB:",IDC_STATIC,131,7,39,8
+ GROUPBOX "\xCE\xF2\xEB\xE8\xF7\xE0\xFE\xF2\xF1\xFF",IDC_STATIC,7,15,186,40
+ RTEXT "\xD2\xE5\xEA\xF1\xF2:",IDC_STATIC,11,26,56,8
ICON "",IDC_STAT_INOTEQUAL,131,24,16,16
RTEXT "Static",IDC_STAT_DIFFFILE,146,25,38,10,SS_SUNKEN
- RTEXT "Binary:",IDC_STATIC,10,40,56,8
+ RTEXT "\xC1\xE8\xED\xE0\xF0\xED\xFB\xE5:",IDC_STATIC,10,40,56,8
ICON "",IDC_STAT_IDIFFBINFILE, 131,37,16,16
RTEXT "Static",IDC_STAT_DIFFBINARY,146,38,38,10,SS_SUNKEN
- GROUPBOX "Unique",IDC_STATIC,7,55,186,40
- RTEXT "Left:",IDC_STATIC,11,66,56,8
+ GROUPBOX "\xD3\xED\xE8\xEA\xE0\xEB\xFC\xED\xFB\xE5",IDC_STATIC,7,55,186,40
+ RTEXT "\xD1\xEB\xE5\xE2\xE0:",IDC_STATIC,11,66,56,8
ICON "",IDC_STAT_ILUNIQFOLDER,72,64,16,16
RTEXT "Static",IDC_STAT_LUNIQFOLDER,86,65,38,10,SS_SUNKEN
ICON "",IDC_STAT_ILUNIQFILE,131,64,16,16
RTEXT "Static",IDC_STAT_LUNIQFILE,146,65,38,10,SS_SUNKEN
- RTEXT "Right:",IDC_STATIC,11,79,56,8
+ RTEXT "\xD1\xEF\xF0\xE0\xE2\xE0:",IDC_STATIC,11,79,56,8
ICON "",IDC_STAT_IRUNIQFOLDER,72,77,16,16
RTEXT "Static",IDC_STAT_RUNIQFOLDER,86,78,38,10,SS_SUNKEN
ICON "",IDC_STAT_IRUNIQFILE,131,77,16,16
RTEXT "Static",IDC_STAT_RUNIQFILE,146,78,38,10,SS_SUNKEN
- GROUPBOX "Identical",IDC_STATIC,7,95,186,37
+ GROUPBOX "\xCE\xE4\xE8\xED\xE0\xEA\xEE\xE2\xFB\xE5",IDC_STATIC,7,95,186,37
ICON "",IDC_STAT_IIDENTICFOLDER,72,102,16,16
RTEXT "Static",IDC_STAT_IDENTICFOLDER,86,103,38,10,SS_SUNKEN
ICON "",IDC_STAT_IEQUALFILE,131,102,16,16
RTEXT "Static",IDC_STAT_IDENTICFILE,146,103,38,10,SS_SUNKEN
- RTEXT "Binary:",IDC_STATIC,10,117,56,8
+ RTEXT "\xC1\xE8\xED\xE0\xF0\xED\xFB\xE5:",IDC_STATIC,10,117,56,8
ICON "",IDC_STAT_IEQUALBINFILE,131,115,16,16
RTEXT "Static",IDC_STAT_IDENTICBINARY,146,116,38,10,SS_SUNKEN
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,136,186,1
- RTEXT "Total:",IDC_STATIC,13,142,56,8
+ RTEXT "\xC2\xF1\xE5\xE3\xEE:",IDC_STATIC,13,142,56,8
ICON "",IDC_STAT_ITOTALFOLDERS,72,140,16,16
RTEXT "Static",IDC_STAT_TOTALFOLDER,86,141,38,10,SS_SUNKEN
ICON "",IDC_STAT_ITOTALFILES,131,140,16,16
RTEXT "Static",IDC_STAT_TOTALFILE,146,141,38,10,SS_SUNKEN
- DEFPUSHBUTTON "Close",IDOK,200,140,50,14
+ DEFPUSHBUTTON "\xC7\xE0\xEA\xF0\xFB\xF2\xFC",IDOK,200,140,50,14
END
IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU | WS_THICKFRAME
-CAPTION "Codepage"
+CAPTION "\xCA\xEE\xE4\xEE\xE2\xE0\xFF \xF1\xF2\xF0\xE0\xED\xE8\xF6\xE0"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- GROUPBOX "Affects",IDC_AFFECTS_GROUP,5,7,166,36
- CONTROL "&Left",IDC_AFFECTS_LEFT_BTN,"Button",BS_AUTOCHECKBOX |
+ GROUPBOX "\xCF\xF0\xE8\xEC\xE5\xED\xE8\xF2\xFC \xEA:",IDC_AFFECTS_GROUP,5,7,166,36
+ CONTROL "\xCB\xE5\xE2\xFB\xE9",IDC_AFFECTS_LEFT_BTN,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,12,18,54,8
- LTEXT "(Affects)",IDC_LEFT_FILES_LABEL,70,18,93,8
- CONTROL "&Right",IDC_AFFECTS_RIGHT_BTN,"Button",BS_AUTOCHECKBOX |
+ LTEXT "(\xEF\xF0\xE8\xEC\xE5\xED\xE8\xF2\xFC)",IDC_LEFT_FILES_LABEL,70,18,93,8
+ CONTROL "\xCF\xF0\xE0\xE2\xFB\xE9",IDC_AFFECTS_RIGHT_BTN,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,12,29,54,8
- LTEXT "(Affects)",IDC_RIGHT_FILES_LABEL,70,29,93,8
- GROUPBOX "Select Codepage for",IDC_LOADING_GROUP,5,48,166,63
- LTEXT "&File Loading:",IDC_LOAD_FILES_LABEL,12,64,72,10
+ LTEXT "(\xEF\xF0\xE8\xEC\xE5\xED\xE8\xF2\xFC)",IDC_RIGHT_FILES_LABEL,70,29,93,8
+ GROUPBOX "\xC2\xFB\xE1\xF0\xE0\xF2\xFC \xEA\xEE\xE4\xEE\xE2\xF3\xFE \xF1\xF2\xF0\xE0\xED\xE8\xF6\xF3 \xE4\xEB\xFF",IDC_LOADING_GROUP,5,48,166,63
+ LTEXT "\xC7\xE0\xE3\xF0\xF3\xE7\xEA\xE0 \xF4\xE0\xE9\xEB\xE0:",IDC_LOAD_FILES_LABEL,12,64,72,10
EDITTEXT IDC_LOAD_CODEPAGE_TEXTBOX,86,63,45,12,ES_AUTOHSCROLL
PUSHBUTTON "...",IDC_LOAD_CODEPAGE_BROWSE,139,64,23,10
- LTEXT "File &Saving:",IDC_SAVE_FILES_LABEL,12,79,67,10
+ LTEXT "\xD1\xEE\xF5\xF0\xE0\xED\xE5\xED\xE8\xE5 \xF4\xE0\xE9\xEB\xE0:",IDC_SAVE_FILES_LABEL,12,79,67,10
EDITTEXT IDC_SAVE_CODEPAGE_TEXTBOX,86,79,45,12,ES_AUTOHSCROLL
PUSHBUTTON "...",IDC_SAVE_CODEPAGE_BROWSE,139,80,23,10
- CONTROL "&Use same codepage for both",
+ CONTROL "\xC8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEE\xE4\xED\xF3 \xE8 \xF2\xF3 \xE6\xE5 \xEA\xEE\xE4\xEE\xE2\xF3\xFE \xF1\xF2\xF0\xE0\xED\xE8\xF6\xF3",
IDC_LOAD_SAVE_SAME_CODEPAGE,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,12,96,150,10
- DEFPUSHBUTTON "&Apply",IDOK,65,117,50,14
- PUSHBUTTON "&Cancel",IDCANCEL,121,117,50,14
+ DEFPUSHBUTTON "&\xCF\xF0\xE8\xEC\xE5\xED\xE8\xF2\xFC",IDOK,65,117,50,14
+ PUSHBUTTON "&\xCE\xF2\xEC\xE5\xED\xE0",IDCANCEL,121,117,50,14
END
IDD_TEST_FILTER DIALOGEX 0, 0, 249, 142
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
-CAPTION "Test Filter"
+CAPTION "\xD2\xE5\xF1\xF2 \xF4\xE8\xEB\xFC\xF2\xF0\xE0"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "Testing filter ...",IDC_HEADER,7,7,82,8
- LTEXT "(filter name)",IDC_HEADER_FILTER_NAME,90,6,152,8
- LTEXT "&Enter text to test:",IDC_PROMPT_LABEL,7,21,80,8
+ LTEXT "\xD2\xE5\xF1\xF2\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xF4\xE8\xEB\xFC\xF2\xF0 ...",IDC_HEADER,7,7,82,8
+ LTEXT "(\xE8\xEC\xFF \xF4\xE8\xEB\xFC\xF2\xF0\xE0)",IDC_HEADER_FILTER_NAME,90,6,152,8
+ LTEXT "\xC2\xE2\xE5\xE4\xE8\xF2\xE5 \xF2\xE5\xF1\xF2\xEE\xE2\xFB\xE9 \xF2\xE5\xEA\xF1\xF2:",IDC_PROMPT_LABEL,7,21,80,8
EDITTEXT IDC_TEST_TEXT,90,19,152,12,ES_AUTOHSCROLL
- CONTROL "&Folder Name",IDC_IS_DIRECTORY,"Button",BS_AUTOCHECKBOX |
+ CONTROL "\xCF\xE0\xEF\xEA\xE0",IDC_IS_DIRECTORY,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,36,92,8
- LTEXT "Result:",IDC_STATIC,7,49,34,8
+ LTEXT "\xD0\xE5\xE7\xF3\xEB\xFC\xF2\xE0\xF2:",IDC_STATIC,7,49,34,8
EDITTEXT IDC_RESULTS,7,59,235,57,ES_MULTILINE | ES_AUTOVSCROLL |
ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL |
NOT WS_TABSTOP
- DEFPUSHBUTTON "&Test",IDC_TEST_BTN,133,121,50,14
- PUSHBUTTON "&Close",IDCANCEL,192,121,50,14
+ DEFPUSHBUTTON "&\xD2\xE5\xF1\xF2\xE8\xF0\xEE\xE2\xE0\xF2\xFC",IDC_TEST_BTN,133,121,50,14
+ PUSHBUTTON "&\xC7\xE0\xEA\xF0\xFB\xF2\xFC",IDCANCEL,192,121,50,14
END
IDD_PROPPAGE_COLORS_TEXT DIALOGEX 0, 0, 197, 157
@@ -1518,16 +1518,16 @@
CAPTION "Dialog"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Use customized text colors",
+ CONTROL "\xC8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xEE\xF1\xEE\xE1\xFB\xE5 \xF6\xE2\xE5\xF2\xE0",
IDC_DEFAULT_STANDARD_COLORS,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,25,14,161,10
- GROUPBOX "Custom text colors",IDC_CUSTOM_COLORS_GROUP,27,33,159,
+ GROUPBOX "\xCD\xE0\xF1\xF2\xF0\xEE\xE8\xF2\xFC \xF6\xE2\xE5\xF2\xE0",IDC_CUSTOM_COLORS_GROUP,27,33,159,
111
- LTEXT "Whitespace:",IDC_WHITESPACE_COLOR_LABEL,31,58,46,10
- LTEXT "Regular text:",IDC_TEXT_COLOR_LABEL,31,87,61,8
- LTEXT "Selection:",IDC_SELECTION_COLOR_LABEL,31,116,61,8
- CTEXT "Background",IDC_BACKGROUND_COLUMN_LABEL,96,44,50,8
- CTEXT "Text",IDC_TEXT_COLUMN_LABEL,145,44,29,8
+ LTEXT "\xCF\xF0\xEE\xE1\xE5\xEB\xFB:",IDC_WHITESPACE_COLOR_LABEL,31,58,46,10
+ LTEXT "\xCE\xE1\xFB\xF7\xED\xFB\xE9 \xF2\xE5\xEA\xF1\xF2:",IDC_TEXT_COLOR_LABEL,31,87,61,8
+ LTEXT "\xC2\xFB\xE4\xE5\xEB\xE5\xED\xED\xFB\xE9 \xF2\xE5\xEA\xF1\xF2:",IDC_SELECTION_COLOR_LABEL,31,116,61,8
+ CTEXT "\xD4\xEE\xED",IDC_BACKGROUND_COLUMN_LABEL,96,44,50,8
+ CTEXT "\xD2\xE5\xEA\xF1\xF2",IDC_TEXT_COLUMN_LABEL,145,44,29,8
CONTROL "Btn",IDC_WHITESPACE_BKGD_COLOR,"Button",BS_OWNERDRAW |
WS_TABSTOP,113,58,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
@@ -1548,24 +1548,24 @@
IDD_PROJFILES_PATHS DIALOGEX 0, 0, 322, 124
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Paths"
+CAPTION "\xCF\xF3\xF2\xE8"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- RTEXT "&Left:",IDC_STATIC,7,11,40,8
+ RTEXT "&\xCB\xE5\xE2\xFB\xE9:",IDC_STATIC,7,11,40,8
EDITTEXT IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL
- PUSHBUTTON "Browse...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
- CONTROL "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
- RTEXT "&Right:",IDC_STATIC,7,42,40,8
+ PUSHBUTTON "\xCE\xE1\xE7\xEE\xF0...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
+ CONTROL "\xD2\xEE\xEB\xFC\xEA\xEE \xF7\xF2\xE5\xED\xE8\xE5",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
+ RTEXT "&\xCF\xF0\xE0\xE2\xFB\xE9:",IDC_STATIC,7,42,40,8
EDITTEXT IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL
- PUSHBUTTON "Browse...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
- CONTROL "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
- RTEXT "&Filter:",IDC_STATIC,7,74,40,8
+ PUSHBUTTON "\xCE\xE1\xE7\xEE\xF0...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
+ CONTROL "\xD2\xEE\xEB\xFC\xEA\xEE \xF7\xF2\xE5\xED\xE8\xE5",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
+ RTEXT "&\xD4\xE8\xEB\xFC\xF2\xF0:",IDC_STATIC,7,74,40,8
EDITTEXT IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL
- PUSHBUTTON "Select...",IDC_PROJ_FILTER_SELECT,265,72,50,14
- CONTROL "&Include Subfolders",IDC_PROJ_INC_SUBFOLDERS,"Button",
+ PUSHBUTTON "\xC2\xFB\xE1\xF0\xE0\xF2\xFC...",IDC_PROJ_FILTER_SELECT,265,72,50,14
+ CONTROL "&\xC2\xEA\xEB\xFE\xF7\xE0\xFF \xEF\xEE\xE4\xEF\xE0\xEF\xEA\xE8",IDC_PROJ_INC_SUBFOLDERS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,50,90,130,10
- PUSHBUTTON "Open...",IDC_PROJ_OPEN,211,103,50,14
- PUSHBUTTON "Save...",IDC_PROJ_SAVE,265,103,50,14
+ PUSHBUTTON "\xCE\xF2\xEA\xF0\xFB\xF2\xFC...",IDC_PROJ_OPEN,211,103,50,14
+ PUSHBUTTON "\xD1\xEE\xF5\xF0\xE0\xED\xE8\xF2\xFC...",IDC_PROJ_SAVE,265,103,50,14
END
#ifndef _MAC
@@ -1738,19 +1738,19 @@
STRINGTABLE
BEGIN
- ID_VIEW_SHOWHIDDENITEMS "Make all hidden items visible again"
+ ID_VIEW_SHOWHIDDENITEMS "\xCF\xEE\xEA\xE0\xE7\xE0\xF2\xFC \xE2\xF1\xE5 \xF1\xEA\xF0\xFB\xF2\xFB\xE5"
END
// WinMerge Project Files
STRINGTABLE
BEGIN
ID_FILE_OPENPROJECT "\xCE\xF2\xEA\xF0\xFB\xF2\xFC \xF4\xE0\xE9\xEB \xEF\xF0\xEE\xE5\xEA\xF2\xE0\n\xD4\xE0\xE9\xEB \xEF\xF0\xEE\xE5\xEA\xF2\xE0 (Ctrl+J)"
- IDS_UNK_ERROR_READING_PROJECT "Unknown error attempting to open project file"
- IDS_UNK_ERROR_SAVING_PROJECT "Unknown error attempting to save project file"
- IDS_PROJFILEDLG_CAPTION "Project File"
- IDS_PROJFILE_LOAD_SUCCESS "Project file successfully loaded."
- IDS_PROJFILE_SAVE_SUCCESS "Project file successfully saved."
- ID_FILE_SAVEPROJECT "Save current paths and options to project file\nSave Project File"
+ IDS_UNK_ERROR_READING_PROJECT "\xCD\xE5\xE8\xE7\xE2\xE5\xF1\xF2\xED\xE0\xFF \xEE\xF8\xE8\xE1\xEA\xE0 \xEF\xF0\xE8 \xEE\xF2\xEA\xF0\xFB\xF2\xE8\xE8 \xF4\xE0\xE9\xEB\xE0 \xEF\xF0\xEE\xE5\xEA\xF2\xE0"
+ IDS_UNK_ERROR_SAVING_PROJECT "\xCD\xE5\xE8\xE7\xE2\xE5\xF1\xF2\xED\xE0\xFF \xEE\xF8\xE8\xE1\xEA\xE0 \xEF\xF0\xE8 \xF1\xEE\xF5\xF0\xE0\xED\xE5\xED\xE8\xE8 \xF4\xE0\xE9\xEB\xE0 \xEF\xF0\xEE\xE5\xEA\xF2\xE0"
+ IDS_PROJFILEDLG_CAPTION "\xD4\xE0\xE9\xEB \xEF\xF0\xEE\xE5\xEA\xF2\xE0"
+ IDS_PROJFILE_LOAD_SUCCESS "\xD4\xE0\xE9\xEB \xEF\xF0\xEE\xE5\xEA\xF2\xE0 \xF3\xF1\xEF\xE5\xF8\xED\xEE \xE7\xE0\xE3\xF0\xF3\xE6\xE5\xED."
+ IDS_PROJFILE_SAVE_SUCCESS "\xD4\xE0\xE9\xEB \xEF\xF0\xEE\xE5\xEA\xF2\xE0 \xF3\xF1\xEF\xE5\xF8\xED\xEE \xF1\xEE\xF5\xF0\xE0\xED\xE5\xED."
+ ID_FILE_SAVEPROJECT "\xD1\xEE\xF5\xF0\xE0\xED\xE8\xF2\xFC \xF2\xE5\xEA\xF3\xF9\xE8\xE5 \xEF\xF3\xF2\xE8 \xE8 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8 \xE2 \xF4\xE0\xE9\xEB \xEF\xF0\xEE\xE5\xEA\xF2\xE0\n\xD1\xEE\xF5\xF0\xE0\xED\xE8\xF2\xFC \xF4\xE0\xE9\xEB \xEF\xF0\xEE\xE5\xEA\xF2\xE0"
END
STRINGTABLE
@@ -1816,8 +1816,8 @@
// View bar commands
STRINGTABLE
BEGIN
- ID_VIEW_TOOLBAR "\xCF\xEE\xEA\xE0\xE7\xE0\xF2\xFC \xE8\xEB\xE8 \xF1\xEF\xF0\xFF\xF2\xE0\xF2\xFC \xEF\xE0\xED\xE5\xEB\xFC \xE8\xED\xF1\xF2\xF0\xF3\xEC\xE5\xED\xF2\xEE\xE2\nToggle ToolBar"
- ID_VIEW_STATUS_BAR "\xCF\xEE\xEA\xE0\xE7\xE0\xF2\xFC \xE8\xEB\xE8 \xF1\xEF\xF0\xFF\xF2\xE0\xF2\xFC \xF1\xF2\xF0\xEE\xEA\xF3 \xF1\xEE\xF1\xF2\xEE\xFF\xED\xE8\xE9\nToggle StatusBar"
+ ID_VIEW_TOOLBAR "\xCF\xEE\xEA\xE0\xE7\xE0\xF2\xFC \xE8\xEB\xE8 \xF1\xEA\xF0\xFB\xF2\xFC \xEF\xE0\xED\xE5\xEB\xFC \xE8\xED\xF1\xF2\xF0\xF3\xEC\xE5\xED\xF2\xEE\xE2\nToggle ToolBar"
+ ID_VIEW_STATUS_BAR "\xCF\xEE\xEA\xE0\xE7\xE0\xF2\xFC \xE8\xEB\xE8 \xF1\xEA\xF0\xFB\xF2\xFC \xF1\xF2\xF0\xEE\xEA\xF3 \xF1\xEE\xF1\xF2\xEE\xFF\xED\xE8\xE9\nToggle StatusBar"
END
// Windows System menu
@@ -1826,9 +1826,9 @@
AFX_IDS_SCSIZE "\xC8\xE7\xEC\xE5\xED\xE8\xF2\xFC \xF0\xE0\xE7\xEC\xE5\xF0 \xEE\xEA\xED\xE0"
AFX_IDS_SCMOVE "\xC8\xE7\xEC\xE5\xED\xE8\xF2\xFC \xEF\xEE\xEB\xEE\xE6\xE5\xED\xE8\xE5 \xEE\xEA\xED\xE0"
AFX_IDS_SCMINIMIZE "\xD1\xE2\xE5\xF0\xED\xF3\xF2\xFC \xEE\xEA\xED\xEE \xE2 \xE7\xED\xE0\xF7\xEE\xEA"
- AFX_IDS_SCMAXIMIZE "\xD0\xE0\xF1\xEF\xE0\xF5\xED\xF3\xF2\xFC \xEE\xEA\xED\xEE \xED\xE0 \xE4\xEE \xEC\xE0\xEA\xF1\xE8\xEC\xF3\xEC\xE0"
- AFX_IDS_SCNEXTWINDOW "\xCF\xE5\xF0\xE5\xEA\xEB\xFE\xF7\xE8\xF2\xFC\xF1\xFF \xED\xE0 \xEE\xEA\xED\xEE \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE5\xE3\xEE \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0"
- AFX_IDS_SCPREVWINDOW "\xCF\xE5\xF0\xE5\xEA\xEB\xFE\xF7\xE8\xF2\xFC\xF1\xFF \xED\xE0 \xEE\xEA\xED\xEE \xEF\xF0\xE5\xE4\xFB\xE4\xF3\xF9\xE5\xE3\xEE \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0"
+ AFX_IDS_SCMAXIMIZE "\xD0\xE0\xF1\xEA\xF0\xFB\xF2\xFC \xEE\xEA\xED\xEE \xE4\xEE \xEC\xE0\xEA\xF1\xE8\xEC\xF3\xEC\xE0"
+ AFX_IDS_SCNEXTWINDOW "\xCF\xE5\xF0\xE5\xEA\xEB\xFE\xF7\xE8\xF2\xFC\xF1\xFF \xED\xE0 \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE8\xE9 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2"
+ AFX_IDS_SCPREVWINDOW "\xCF\xE5\xF0\xE5\xEA\xEB\xFE\xF7\xE8\xF2\xFC\xF1\xFF \xED\xE0 \xEF\xF0\xE5\xE4\xFB\xE4\xF3\xF9\xE8\xE9 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2"
AFX_IDS_SCCLOSE "\xC7\xE0\xEA\xF0\xFB\xF2\xFC \xE0\xEA\xF2\xE8\xE2\xED\xEE\xE5 \xEE\xEA\xED\xEE \xE8 \xF1\xEF\xF0\xEE\xF1\xE8\xF2\xFC \xEE \xF1\xEE\xF5\xF0\xE0\xED\xE5\xED\xE8\xE8 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xEE\xE2"
END
@@ -1842,7 +1842,7 @@
// Print Preview
STRINGTABLE
BEGIN
- AFX_IDS_PREVIEW_CLOSE "\xC7\xE0\xEA\xF0\xFB\xF2\xFC \xEE\xEA\xED\xEE \xEF\xF0\xE5\xE4\xEF\xF0\xEE\xF1\xEC\xEE\xF2\xF0\xE0 \xEF\xE5\xF7\xE0\xF2\xE8\nCancel Preview"
+ AFX_IDS_PREVIEW_CLOSE "\xC7\xE0\xEA\xF0\xFB\xF2\xFC \xEE\xEA\xED\xEE \xEF\xF0\xE5\xE4\xE2\xE0\xF0\...
[truncated message content] |
