|
From: <ki...@us...> - 2007-02-07 19:46:44
|
Revision: 4099
http://svn.sourceforge.net/winmerge/?rev=4099&view=rev
Author: kimmov
Date: 2007-02-07 10:37:52 -0800 (Wed, 07 Feb 2007)
Log Message:
-----------
PATCH: [ 1652696 ] Add more options for backup files
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Common/PreferencesDlg.cpp
trunk/Src/Common/PreferencesDlg.h
trunk/Src/FileActionScript.cpp
trunk/Src/Languages/Brazilian/MergeBrazilian.rc
trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
trunk/Src/Languages/Catalan/MergeCatalan.rc
trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
trunk/Src/Languages/Czech/MergeCzech.rc
trunk/Src/Languages/Danish/MergeDanish.rc
trunk/Src/Languages/Dutch/MergeDutch.rc
trunk/Src/Languages/French/MergeFrench.rc
trunk/Src/Languages/German/MergeGerman.rc
trunk/Src/Languages/Hungarian/MergeHungarian.rc
trunk/Src/Languages/Italian/MergeItalian.rc
trunk/Src/Languages/Japanese/MergeJapanese.rc
trunk/Src/Languages/Korean/MergeKorean.rc
trunk/Src/Languages/Norwegian/MergeNorwegian.rc
trunk/Src/Languages/Polish/MergePolish.rc
trunk/Src/Languages/Russian/MergeRussian.rc
trunk/Src/Languages/Slovak/MergeSlovak.rc
trunk/Src/Languages/Spanish/MergeSpanish.rc
trunk/Src/Languages/Swedish/MergeSwedish.rc
trunk/Src/Languages/Turkish/MergeTurkish.rc
trunk/Src/MainFrm.cpp
trunk/Src/MainFrm.h
trunk/Src/Merge.dsp
trunk/Src/Merge.rc
trunk/Src/MergeDoc.cpp
trunk/Src/OptionsDef.h
trunk/Src/OptionsInit.cpp
trunk/Src/PropGeneral.cpp
trunk/Src/PropGeneral.h
trunk/Src/resource.h
Added Paths:
-----------
trunk/Src/PropBackups.cpp
trunk/Src/PropBackups.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-03 15:57:56 UTC (rev 4098)
+++ trunk/Src/Changes.txt 2007-02-07 18:37:52 UTC (rev 4099)
@@ -2,6 +2,14 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-02-07 Kimmo
+ PATCH: [ 1652696 ] Add more options for backup files
+ Src: FileActionScript.cpp MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
+ OptionsDef.h OptionsInit.cpp PropGeneral.cpp PropGeneral.h resource.h
+ Src new files: PropBackups.cpp PropBackups.h
+ Src/Common: PreferencesDlg.cpp PreferencesDlg.h
+ Src/Languages/*: Merge*.rc
+
2007-02-03 Kimmo
Remove unused enum definition
Src: PropCompare.h
Modified: trunk/Src/Common/PreferencesDlg.cpp
===================================================================
--- trunk/Src/Common/PreferencesDlg.cpp 2007-02-03 15:57:56 UTC (rev 4098)
+++ trunk/Src/Common/PreferencesDlg.cpp 2007-02-07 18:37:52 UTC (rev 4099)
@@ -7,7 +7,7 @@
* (http://www.abstractspoon.com/) but is modified to use in
* WinMerge.
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -53,6 +53,7 @@
, m_pageCodepage(regOptions)
, m_pageEditor(regOptions)
, m_pageSystem(regOptions)
+, m_pageBackups(regOptions)
, m_pageVss(regOptions)
{
UNREFERENCED_PARAMETER(nMenuID);
@@ -102,6 +103,7 @@
AddPage(&m_pageSyntaxColors, IDS_OPTIONSPG_SYNTAXCOLORS);
AddPage(&m_pageArchive, IDS_OPTIONSPG_ARCHIVE);
AddPage(&m_pageSystem, IDS_OPTIONSPG_SYSTEM);
+ AddPage(&m_pageBackups, IDS_OPTIONSPG_BACKUPS);
AddPage(&m_pageVss, IDS_OPTIONSPG_VERSIONCONTROL);
AddPage(&m_pageCodepage, IDS_OPTIONSPG_CODEPAGE);
@@ -250,6 +252,7 @@
m_pageCodepage.ReadOptions();
m_pageVss.ReadOptions();
m_pageArchive.ReadOptions();
+ m_pageBackups.ReadOptions();
if (bUpdate)
{
@@ -263,6 +266,7 @@
SafeUpdatePage(&m_pageCodepage, FALSE);
SafeUpdatePage(&m_pageVss, FALSE);
SafeUpdatePage(&m_pageArchive, FALSE);
+ SafeUpdatePage(&m_pageBackups, FALSE);
}
}
@@ -281,6 +285,7 @@
m_pageCodepage.WriteOptions();
m_pageVss.WriteOptions();
m_pageArchive.WriteOptions();
+ m_pageBackups.WriteOptions();
}
void CPreferencesDlg::SetSyntaxColors(SyntaxColors *pColors)
Modified: trunk/Src/Common/PreferencesDlg.h
===================================================================
--- trunk/Src/Common/PreferencesDlg.h 2007-02-03 15:57:56 UTC (rev 4098)
+++ trunk/Src/Common/PreferencesDlg.h 2007-02-07 18:37:52 UTC (rev 4099)
@@ -7,7 +7,7 @@
* (http://www.abstractspoon.com/) but is modified to use in
* WinMerge.
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
@@ -28,6 +28,7 @@
#include "PropSyntaxColors.h"
#include "PropCodepage.h"
#include "PropArchive.h"
+#include "PropBackups.h"
#include "propertypagehost.h"
@@ -66,6 +67,7 @@
CPropTextColors m_pageTextColors;
CPropSyntaxColors m_pageSyntaxColors;
CPropArchive m_pageArchive;
+ CPropBackups m_pageBackups;
SyntaxColors *m_pSyntaxColors;
Modified: trunk/Src/FileActionScript.cpp
===================================================================
--- trunk/Src/FileActionScript.cpp 2007-02-03 15:57:56 UTC (rev 4098)
+++ trunk/Src/FileActionScript.cpp 2007-02-07 18:37:52 UTC (rev 4099)
@@ -144,13 +144,26 @@
const FileActionItem act = m_actions.GetNext(pos);
if (act.atype == FileAction::ACT_COPY && !act.dirflag)
{
- int retVal = VCSCheckOut(act.src, bApplyToAll);
- if (retVal == SCRIPT_USERCANCEL)
- bContinue = FALSE;
- else if (retVal == SCRIPT_USERSKIP)
- bSkip = TRUE;
- else if (retVal == SCRIPT_FAIL)
- bContinue = FALSE;
+ if (GetOptionsMgr()->GetInt(OPT_VCS_SYSTEM) != VCS_NONE)
+ {
+ int retVal = VCSCheckOut(act.src, bApplyToAll);
+ if (retVal == SCRIPT_USERCANCEL)
+ bContinue = FALSE;
+ else if (retVal == SCRIPT_USERSKIP)
+ bSkip = TRUE;
+ else if (retVal == SCRIPT_FAIL)
+ bContinue = FALSE;
+ }
+
+ if (bContinue)
+ {
+ if (!GetMainFrame()->CreateBackup(TRUE, act.src))
+ {
+ CString strErr = LoadResString(IDS_ERROR_BACKUP);
+ AfxMessageBox(strErr, MB_OK | MB_ICONERROR);
+ bContinue = FALSE;
+ }
+ }
}
if (act.atype == FileAction::ACT_COPY &&
Modified: trunk/Src/Languages/Brazilian/MergeBrazilian.rc
===================================================================
--- trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2007-02-03 15:57:56 UTC (rev 4098)
+++ trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2007-02-07 18:37:52 UTC (rev 4099)
@@ -727,32 +727,30 @@
CAPTION "Geral"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Guardar c\xF3pia de seguran\xE7a do arquivo original",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "Posicionar a&utomaticamente na primeira diferen\xE7a",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "&Desabilitar Splash Screen",IDC_DISABLE_SPLASH,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
+ CONTROL "Cl&ose windows with ESC",IDC_ESC_CLOSES_WINDOW,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
- CONTROL "Cl&ose windows with ESC",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
CONTROL "&Automatically verify paths in Open-dialog",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "All&ow only one instance to run",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 |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,100,
+ GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,90,
221,37
CONTROL "&Folder compare",IDC_MULTIDOC_DIRCMP,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
+ CONTROL "Fil&e compare",IDC_MULTIDOC_FILECMP,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
- CONTROL "Fil&e compare",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.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "Reset",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
@@ -1572,6 +1570,31 @@
PUSHBUTTON "Save...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1923,6 +1946,7 @@
IDS_OPTIONSPG_VERSIONCONTROL "Version Control"
IDS_OPTIONSPG_CODEPAGE "Codepage"
IDS_OPTIONSPG_ARCHIVE "Archive Support"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
Modified: trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-02-03 15:57:56 UTC (rev 4098)
+++ trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-02-07 18:37:52 UTC (rev 4099)
@@ -727,32 +727,30 @@
CAPTION "\xCE\xF1\xED\xEE\xE2\xED\xE8"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&\xD0\xE5\xE7\xE5\xF0\xE2\xED\xEE \xEA\xEE\xEF\xE8\xE5 \xED\xE0 \xEE\xF0\xE8\xE3\xE8\xED\xE0\xEB\xED\xE8\xFF \xF4\xE0\xE9\xEB",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xF7\xED\xEE &\xEF\xF0\xE8\xE4\xE2\xE8\xE6\xE2\xE0\xED\xE5 \xEA\xFA\xEC \xEF\xFA\xF0\xE2\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "&\xC7\xE0\xE1\xF0\xE0\xED\xE8 \xED\xE0\xF7\xE0\xEB\xED\xE8\xFF \xEF\xF0\xEE\xE7\xEE\xF0\xE5\xF6",IDC_DISABLE_SPLASH,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
+ CONTROL "\xC7\xE0\xF2\xE2\xEE\xF0\xE8 &\xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xEF\xF0\xE8 ESC",IDC_ESC_CLOSES_WINDOW,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
- CONTROL "\xC7\xE0\xF2\xE2\xEE\xF0\xE8 &\xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xEF\xF0\xE8 ESC",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
CONTROL "&\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xF7\xED\xEE \xEF\xF0\xEE\xE2\xE5\xF0\xE8 \xEF\xFA\xF2\xE8\xF9\xE0\xF2\xE0 \xE2 \xE4\xE8\xE0\xEB\xEE\xE3\xE0 \xCE\xF2\xE2\xEE\xF0\xE8",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "\xCF\xEE\xE7\xE2\xEE\xEB\xE8 \xF1\xE0\xEC\xEE &\xE5\xE4\xED\xEE \xF1\xF2\xE0\xF0\xF2\xE8\xF0\xE0\xED\xEE \xEA\xEE\xEF\xE8\xE5",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 |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "\xCF\xEE\xE7\xE2\xEE\xEB\xE8 \xEC\xED\xEE\xE3\xEE \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8 \xE7\xE0 \xF1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xE7\xE0",IDC_STATIC,7,100,
+ GROUPBOX "\xCF\xEE\xE7\xE2\xEE\xEB\xE8 \xEC\xED\xEE\xE3\xEE \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8 \xE7\xE0 \xF1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xE7\xE0",IDC_STATIC,7,90,
221,37
CONTROL "\xD1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xED\xE0 &\xCF\xE0\xEF\xEA\xE8",IDC_MULTIDOC_DIRCMP,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
+ CONTROL "\xD1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xED\xE0 &\xD4\xE0\xE9\xEB\xEE\xE2\xE5",IDC_MULTIDOC_FILECMP,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
- CONTROL "\xD1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xED\xE0 &\xD4\xE0\xE9\xEB\xEE\xE2\xE5",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
LTEXT "WinMerge \xEF\xEE\xE7\xE2\xEE\xEB\xFF\xE2\xE0 \xF1\xEA\xF0\xE8\xE2\xE0\xED\xE5 \xED\xE0 \xED\xFF\xEA\xEE\xE8 \xF1\xFA\xEE\xE1\xF9\xE5\xED\xE8\xFF. \xCD\xE0\xF2\xE8\xF1\xED\xE5\xF2\xE5 \xE1\xF3\xF2\xEE\xED\xE0 \xC2\xFA\xE7\xF1\xF2\xE0\xED\xEE\xE2\xE8, \xE7\xE0 \xE4\xE0 \xEF\xEE\xEA\xE0\xE6\xE5\xF2\xE5 \xEF\xE0\xEA \xF2\xE5\xE7\xE8 \xF1\xFA\xEE\xE1\xF9\xE5\xED\xE8\xFF.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "\xC2\xFA\xE7\xF1\xF2\xE0\xED\xEE\xE2\xE8",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "\xC2\xFA\xE7\xF1\xF2\xE0\xED\xEE\xE2\xE8",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
@@ -1572,6 +1570,30 @@
PUSHBUTTON "\xC7\xE0\xEF\xE8\xF8\xE8...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1941,6 +1963,7 @@
IDS_OPTIONSPG_VERSIONCONTROL "\xCA\xEE\xED\xF2\xF0\xEE\xEB \xED\xE0 \xE2\xE5\xF0\xF1\xE8\xFF\xF2\xE0"
IDS_OPTIONSPG_CODEPAGE "\xCA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0"
IDS_OPTIONSPG_ARCHIVE "\xCF\xEE\xE4\xE4\xF0\xFA\xE6\xEA\xE0 \xED\xE0 \xE0\xF0\xF5\xE8\xE2\xE8"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-02-03 15:57:56 UTC (rev 4098)
+++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-02-07 18:37:52 UTC (rev 4099)
@@ -727,32 +727,30 @@
CAPTION "General"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Guarda una c\xF2pia del fitxer original",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "&Despla\xE7a autom\xE0ticament fins a la primera difer\xE8ncia",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "Inhabilita la pantalla de &benvinguda",IDC_DISABLE_SPLASH,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
+ CONTROL "T&anca les finestres amb ESC",IDC_ESC_CLOSES_WINDOW,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
- CONTROL "T&anca les finestres amb ESC",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
CONTROL "&Verifica els trajectes autom\xE0ticament al di\xE0leg d'Obrir",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "&Permet d'executar nom\xE9s una inst\xE0ncia",IDC_SINGLE_INSTANCE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
- LTEXT "Autocompletar al di\xE0leg d'obrir:",IDC_STATIC,19,72,125,8
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "Autocompletar al di\xE0leg d'obrir:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Permet m\xFAltiples finestres de comparaci\xF3 per",IDC_STATIC,7,100,
+ GROUPBOX "Permet m\xFAltiples finestres de comparaci\xF3 per",IDC_STATIC,7,90,
221,37
CONTROL "Comparaci\xF3 de &carpetes",IDC_MULTIDOC_DIRCMP,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
+ CONTROL "Comparaci\xF3 de &fitxers",IDC_MULTIDOC_FILECMP,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
- CONTROL "Comparaci\xF3 de &fitxers",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
LTEXT "El WinMerge permet ocultar alguns quadres de missatges comuns. Premeu el bot\xF3 de Reinicialitzaci\xF3 per a fer visibles tots els quadres de missatges altre cop.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "Reinicialitza",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "Reinicialitza",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
@@ -1572,6 +1570,31 @@
PUSHBUTTON "De&sa...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1941,6 +1964,7 @@
IDS_OPTIONSPG_VERSIONCONTROL "Control de versions"
IDS_OPTIONSPG_CODEPAGE "P\xE0gina de codis"
IDS_OPTIONSPG_ARCHIVE "Suport d'arxivament"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
Modified: trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
===================================================================
--- trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-02-03 15:57:56 UTC (rev 4098)
+++ trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-02-07 18:37:52 UTC (rev 4099)
@@ -729,31 +729,29 @@
CAPTION "\xB3\xA3\xB9\xE6"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "\xB1\xB8\xB7\xDDԭʼ\xCEļ\xFE(&B)",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "\xD7Զ\xAF\xB9\xBD\xB5\xDAһ\xB4\xA6\xB2\xBBͬ(&S)",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "ͣ\xD3\xC3\xC6\xF4\xB6\xAF\xC6\xC1Ļ(&D)",IDC_DISABLE_SPLASH,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
+ CONTROL "ESC\xB9رմ\xB0\xBF\xDA(&O)",IDC_ESC_CLOSES_WINDOW,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
- CONTROL "ESC\xB9رմ\xB0\xBF\xDA(&O)",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
CONTROL "\xD4ڡ\xB0\xB4\xB1\xB6Ի\xB0\xBF\xF2\xD6\xD0\xD7Զ\xAF\xD1\xE9֤·\xBE\xB6",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "ֻ\xD4\xCA\xD0\xED\xD4\xCB\xD0\xD0һ\xB8\xF6ʵ\xC0\xFD(&A)",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,148,70,80,41,CBS_DROPDOWNLIST |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "\xD4\xCA\xD0\xED\xB6\xE0\xB8\xF6\xB6Աȴ\xB0\xBF\xDA",IDC_STATIC,7,100,221,37
+ GROUPBOX "\xD4\xCA\xD0\xED\xB6\xE0\xB8\xF6\xB6Աȴ\xB0\xBF\xDA",IDC_STATIC,7,90,221,37
CONTROL "\xCEļ\xFE\xBCжԱ\xC8(&F)",IDC_MULTIDOC_DIRCMP,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
+ CONTROL "\xCEļ\xFE\xB6Ա\xC8(&E)",IDC_MULTIDOC_FILECMP,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
- CONTROL "\xCEļ\xFE\xB6Ա\xC8(&E)",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.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "\xD6\xD8\xD6\xC3",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "\xD6\xD8\xD6\xC3",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
@@ -1573,6 +1571,31 @@
PUSHBUTTON "Save...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1924,6 +1947,7 @@
IDS_OPTIONSPG_VERSIONCONTROL "\xB0汾\xBF\xD8\xD6\xC6"
IDS_OPTIONSPG_CODEPAGE "\xB4\xFA\xC2\xEBҳ"
IDS_OPTIONSPG_ARCHIVE "ѹ\xCB\xF5\xB0\xFC֧\xB3\xD6"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
Modified: trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
===================================================================
--- trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2007-02-03 15:57:56 UTC (rev 4098)
+++ trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2007-02-07 18:37:52 UTC (rev 4099)
@@ -727,32 +727,30 @@
CAPTION "\xA4@\xAF\xEB"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "\xB3ƥ\xF7\xAD\xEC\xA9l\xAA\xBA\xC0ɮ\xD7(&B)",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "\xA6۰ʦa\xB1\xB2\xB0ʨ\xEC\xB2Ĥ@\xADӤ\xA3\xA6P(&S)",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "\xB0\xB1\xA5ΤޤH\xAA`\xA5ت\xBA\xBFù\xF5(&D)",IDC_DISABLE_SPLASH,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
+ CONTROL "\xAB\xF6\xA4U ESC \xAE\xC9\xC3\xF8\xB5\xA1(&O)",IDC_ESC_CLOSES_WINDOW,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
- CONTROL "\xAB\xF6\xA4U ESC \xAE\xC9\xC3\xF8\xB5\xA1(&O)",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
CONTROL "\xA6b\xB6}\xB1ҹ\xEF\xB8ܲ\xB0\xA6۰ʦa\xC5\xE7\xC3Ҹ\xF4\xAE|",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "&Allow only one instance to run",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 |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,100,
+ GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,90,
221,37
CONTROL "&Folder compare",IDC_MULTIDOC_DIRCMP,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
+ CONTROL "Fil&e compare",IDC_MULTIDOC_FILECMP,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
- CONTROL "Fil&e compare",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.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "\xAD\xAB\xB3]",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "\xAD\xAB\xB3]",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
@@ -1572,6 +1570,31 @@
PUSHBUTTON "Save...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1923,6 +1946,7 @@
IDS_OPTIONSPG_VERSIONCONTROL "Version Control"
IDS_OPTIONSPG_CODEPAGE "Codepage"
IDS_OPTIONSPG_ARCHIVE "Archive Support"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
Modified: trunk/Src/Languages/Czech/MergeCzech.rc
===================================================================
--- trunk/Src/Languages/Czech/MergeCzech.rc 2007-02-03 15:57:56 UTC (rev 4098)
+++ trunk/Src/Languages/Czech/MergeCzech.rc 2007-02-07 18:37:52 UTC (rev 4099)
@@ -727,32 +727,30 @@
CAPTION "Obecn\xE9"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Z\xE1lohovat p\xF9vodn\xED soubory",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "Automaticky posunout na pr&vn\xED rozd\xEDl",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "Nezobrazovat \xFAvodn\xED o&brazovku",IDC_DISABLE_SPLASH,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
+ CONTROL "Zav\xEDrat okna kl\xE1vesou &Esc",IDC_ESC_CLOSES_WINDOW,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
- CONTROL "Zav\xEDrat okna kl\xE1vesou &Esc",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
CONTROL "Automaticky &ov\xEC\xF8ovat cesty v dialogu Otev\xF8\xEDt",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "Povolit pouze jedno &hlavn\xED okno aplikace",IDC_SINGLE_INSTANCE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
- LTEXT "Automatick\xE9 &dokon\xE8ov\xE1n\xED:",IDC_STATIC,19,72,125,8
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "Automatick\xE9 &dokon\xE8ov\xE1n\xED:",IDC_STATIC,19,62,125,8
COMBOBOX IDC_AUTO_COMPLETE_SOURCE,148,70,80,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Povolit v\xEDce oken pro porovn\xE1n\xED",IDC_STATIC,7,100,
+ GROUPBOX "Povolit v\xEDce oken pro porovn\xE1n\xED",IDC_STATIC,7,90,
221,37
CONTROL "s&lo\x9Eek",IDC_MULTIDOC_DIRCMP,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
+ CONTROL "&soubor\xF9",IDC_MULTIDOC_FILECMP,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
- CONTROL "&soubor\xF9",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
LTEXT "N\xECkter\xE1 obecn\xE1 okna se zpr\xE1vami je mo\x9Eno skr\xFDt.\nPo stisknut\xED tla\xE8\xEDtka Vr\xE1tit se v\x9Aechna tato okna op\xECt budou objevovat.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "V&r\xE1tit",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "V&r\xE1tit",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
@@ -1572,6 +1570,30 @@
PUSHBUTTON "&Ulo\x9Eit...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1923,6 +1945,7 @@
IDS_OPTIONSPG_VERSIONCONTROL "Kontrola verz\xED"
IDS_OPTIONSPG_CODEPAGE "K\xF3dov\xE1n\xED"
IDS_OPTIONSPG_ARCHIVE "Podpora archiv\xF9"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
Modified: trunk/Src/Languages/Danish/MergeDanish.rc
===================================================================
--- trunk/Src/Languages/Danish/MergeDanish.rc 2007-02-03 15:57:56 UTC (rev 4098)
+++ trunk/Src/Languages/Danish/MergeDanish.rc 2007-02-07 18:37:52 UTC (rev 4099)
@@ -727,32 +727,30 @@
CAPTION "Generelt"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Backup originale filer",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "Automatisk &scroll til f\xF8rste forskel",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "&Fjern Splash Screen",IDC_DISABLE_SPLASH,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
+ CONTROL "L&uk vinduer med ESC tasten",IDC_ESC_CLOSES_WINDOW,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
- CONTROL "L&uk vinduer med ESC tasten",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
CONTROL "&Verificer automatisk stinavnene i \xE5ben dialogen",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "&Allow only one instance to run",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 |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,100,
+ GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,90,
221,37
CONTROL "&Folder compare",IDC_MULTIDOC_DIRCMP,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
+ CONTROL "Fil&e compare",IDC_MULTIDOC_FILECMP,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
- CONTROL "Fil&e compare",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.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "Nulstil",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "Nulstil",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
@@ -1572,6 +1570,31 @@
PUSHBUTTON "Save...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1923,6 +1946,7 @@
IDS_OPTIONSPG_VERSIONCONTROL "Version Control"
IDS_OPTIONSPG_CODEPAGE "Codepage"
IDS_OPTIONSPG_ARCHIVE "Archive Support"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
Modified: trunk/Src/Languages/Dutch/MergeDutch.rc
===================================================================
--- trunk/Src/Languages/Dutch/MergeDutch.rc 2007-02-03 15:57:56 UTC (rev 4098)
+++ trunk/Src/Languages/Dutch/MergeDutch.rc 2007-02-07 18:37:52 UTC (rev 4099)
@@ -727,32 +727,30 @@
CAPTION "Algemeen"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Reservekopie orginele bestand",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "&Automatisch naar eerste verschil gaan",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "Splash Screen uitscha&kelen",IDC_DISABLE_SPLASH,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
CONTROL "Vensters met ESC sl&uiten",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
CONTROL "Paden automatisch controleren in het venster Openen",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "&Allow only one instance to run",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 |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,100,
+ GROUPBOX "Enable multiple compare windows for",IDC_STATIC,7,90,
221,37
CONTROL "&Folder compare",IDC_MULTIDOC_DIRCMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
CONTROL "Fil&e compare",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
LTEXT "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "Herstellen",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "Herstellen",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
@@ -1923,6 +1921,7 @@
IDS_OPTIONSPG_VERSIONCONTROL "Version Control"
IDS_OPTIONSPG_CODEPAGE "Codepage"
IDS_OPTIONSPG_ARCHIVE "Archive Support"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
Modified: trunk/Src/Languages/French/MergeFrench.rc
===================================================================
--- trunk/Src/Languages/French/MergeFrench.rc 2007-02-03 15:57:56 UTC (rev 4098)
+++ trunk/Src/Languages/French/MergeFrench.rc 2007-02-07 18:37:52 UTC (rev 4099)
@@ -725,32 +725,30 @@
CAPTION "G\xE9n\xE9ral"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "Cr\xE9e un &backup des fichiers originaux",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,145,10
CONTROL "&Atteindre automatiquement la premi\xE8re diff\xE9rence",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,183,10
+ 7,183,10
CONTROL "&Sans page de garde",IDC_DISABLE_SPLASH,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,27,80,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,80,10
CONTROL "Fermer les fen\xEAtres avec la &touche ESC",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
CONTROL "&V\xE9rifier automatiquement les chemins de la fen\xEAtre-Ouvrir",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,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 |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Qualifier plusieurs fen\xEAtres pour",IDC_STATIC,7,100,
+ GROUPBOX "Qualifier plusieurs fen\xEAtres pour",IDC_STATIC,7,90,
221,37
CONTROL "comparaison de R\xE9pert&oires",IDC_MULTIDOC_DIRCMP,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
+ CONTROL "comparaison de &Fichiers",IDC_MULTIDOC_FILECMP,
"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.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "&Initialiser",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "&Initialiser",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
@@ -1570,6 +1568,31 @@
PUSHBUTTON "Save...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1910,12 +1933,13 @@
IDS_OPTIONSPG_COMPARE "Comparaison"
IDS_OPTIONSPG_EDITOR "\xC9diteur"
IDS_OPTIONSPG_COLORS "Couleurs"
+ IDS_OPTIONSPG_SYNTAXCOLORS "Couleurs de la syntaxe"
+ IDS_OPTIONSPG_TEXTCOLORS "Text Colors"
IDS_OPTIONSPG_SYSTEM "Syst\xE8me"
IDS_OPTIONSPG_VERSIONCONTROL "Controle de version"
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_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
Modified: trunk/Src/Languages/German/MergeGerman.rc
===================================================================
--- trunk/Src/Languages/German/MergeGerman.rc 2007-02-03 15:57:56 UTC (rev 4098)
+++ trunk/Src/Languages/German/MergeGerman.rc 2007-02-07 18:37:52 UTC (rev 4099)
@@ -727,32 +727,30 @@
CAPTION "Allgemein"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Sicherheitskopie der Originaldatei",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "Anzeige automatisch auf den ersten Unterschied &positionieren",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,210,10
+ 7,210,10
CONTROL "Startbildschirm &deaktivieren",IDC_DISABLE_SPLASH,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
+ CONTROL "Fenster mit &ESC schliessen",IDC_ESC_CLOSES_WINDOW,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
- CONTROL "Fenster mit &ESC schliessen",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
CONTROL "P&fade im \xD6ffnen-Dialog automatisch \xFCberpr\xFCfen",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "&Nur eine Programm-Instanz zulassen",IDC_SINGLE_INSTANCE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
- LTEXT "\xD6ffnen-Dialog Auto&vervollst\xE4ndigung:",IDC_STATIC,19,72,125,8
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "\xD6ffnen-Dialog Auto&vervollst\xE4ndigung:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Aktivieren mehrfacher Vergleichsfenster f\xFCr",IDC_STATIC,7,100,
+ GROUPBOX "Aktivieren mehrfacher Vergleichsfenster f\xFCr",IDC_STATIC,7,90,
221,37
CONTROL "&Ordnervergleich",IDC_MULTIDOC_DIRCMP,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
+ CONTROL "D&ateivergleich",IDC_MULTIDOC_FILECMP,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
- CONTROL "D&ateivergleich",IDC_MULTIDOC_FILECMP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,121,206,10
LTEXT "WinMerge erlaubt das Verstecken von einigen h\xE4ufigen Meldungen.\nDr\xFCcken Sie die Zur\xFCcksetzen-Schaltfl\xE4che um alle Meldungen wieder sichtbar zumachen.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "Zur\xFCcksetzen",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "Zur\xFCcksetzen",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
@@ -1572,6 +1570,31 @@
PUSHBUTTON "Speichern...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1923,6 +1946,7 @@
IDS_OPTIONSPG_VERSIONCONTROL "Versionskontrolle"
IDS_OPTIONSPG_CODEPAGE "Zeichensatz"
IDS_OPTIONSPG_ARCHIVE "Archiv-Unterst\xFCtzung"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
Modified: trunk/Src/Languages/Hungarian/MergeHungarian.rc
===================================================================
--- trunk/Src/Languages/Hungarian/MergeHungarian.rc 2007-02-03 15:57:56 UTC (rev 4098)
+++ trunk/Src/Languages/Hungarian/MergeHungarian.rc 2007-02-07 18:37:52 UTC (rev 4099)
@@ -727,32 +727,30 @@
CAPTION "\xC1ltal\xE1nos"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Biztons\xE1gi m\xE1solat az eredeti f\xE1jlr\xF3l",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "Automatikus &ugr\xE1s az els\xF5 elt\xE9r\xE9sre",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "&Splash Screen letilt\xE1sa",IDC_DISABLE_SPLASH,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
+ CONTROL "Ablakok bez\xE1r\xE1sa az &ESC billenty\xFBvel",IDC_ESC_CLOSES_WINDOW,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
- CONTROL "Ablakok bez\xE1r\xE1sa az &ESC billenty\xFBvel",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
CONTROL "Automatikus \xFAtvonalellen\xF5rz\xE9s a &Megnyit\xE1s ablakban",
IDC_VERIFY_OPEN_PATHS,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,7,47,206,10
+ WS_TABSTOP,7,37,206,10
CONTROL "Csak &egy p\xE9ld\xE1ny fut\xE1s\xE1nak enged\xE9lyez\xE9se",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 |
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
+ LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
- GROUPBOX "T\xF6bbsz\xF6r\xF6s \xF6sszehasonl\xEDt\xF3 ablakok enged\xE9lyez\xE9se:",IDC_STATIC,7,100,
+ GROUPBOX "T\xF6bbsz\xF6r\xF6s \xF6sszehasonl\xEDt\xF3 ablakok enged\xE9lyez\xE9se:",IDC_STATIC,7,90,
221,37
CONTROL "&Mappa \xF6sszehasonl\xEDt\xE1skor",IDC_MULTIDOC_DIRCMP,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
+ CONTROL "&F\xE1jl \xF6sszehasonl\xEDt\xE1skor",IDC_MULTIDOC_FILECMP,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,206,10
- CONTROL "&F\xE1jl \xF6sszehasonl\xEDt\xE1skor",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.",
- IDC_STATIC,7,153,168,31
- PUSHBUTTON "Vissza\xE1ll\xEDt",IDC_RESET_ALL_MESSAGE_BOXES,178,159,50,14,NOT
+ IDC_STATIC,7,143,168,31
+ PUSHBUTTON "Vissza\xE1ll\xEDt",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
END
@@ -1570,6 +1568,31 @@
PUSHBUTTON "Save...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
@@ -1921,6 +1944,7 @@
IDS_OPTIONSPG_VERSIONCONTROL "Verzi\xF3 Kontroll"
IDS_OPTIONSPG_CODEPAGE "K\xF3dlap"
IDS_OPTIONSPG_ARCHIVE "Arch\xEDvum t\xE1mogat\xE1s"
+ IDS_OPTIONSPG_BACKUPS "Backup Files"
END
// WINMERGE CUSTOM STRINGS
Modified: trunk/Src/Languages/Italian/MergeItalian.rc
===================================================================
--- trunk/Src/Languages/Italian/MergeItalian.rc 2007-02-03 15:57:56 UTC (rev 4098)
+++ trunk/Src/Languages/Italian/MergeItalian.rc 2007-02-07 18:37:52 UTC (rev 4099)
@@ -727,32 +727,30 @@
CAPTION "Generale"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "Salva copia di bac&kup del file originale",IDC_BACKUP_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "&Visualizza automaticamente la prima differenza",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
- 17,206,10
+ 7,206,10
CONTROL "&Disattiva la schermata iniziale",IDC_DISABLE_SPLASH,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,17,206,10
+ CONTROL "C&hiudi finestra con ESC",IDC_ESC_CLOSES_WINDOW,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10
- CONTROL "C&hiudi finestra con ESC",IDC_ESC_CLOSES_WINDOW,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,37,206,10
CONTROL ...
[truncated message content] |
|
From: <ge...@us...> - 2007-02-07 22:03:36
|
Revision: 4100
http://svn.sourceforge.net/winmerge/?rev=4100&view=rev
Author: gerundt
Date: 2007-02-07 14:03:11 -0800 (Wed, 07 Feb 2007)
Log Message:
-----------
PATCH: [ 1582537 ] CSS syntax highlighter
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Merge.dsp
trunk/Src/editlib/ccrystaltextview.cpp
trunk/Src/editlib/ccrystaltextview.h
Added Paths:
-----------
trunk/Src/editlib/css.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-07 18:37:52 UTC (rev 4099)
+++ trunk/Src/Changes.txt 2007-02-07 22:03:11 UTC (rev 4100)
@@ -2,6 +2,12 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-02-07 Tim
+ PATCH: [ 1582537 ] CSS syntax highlighter
+ Src: Merge.dsp
+ editlib: ccrystaltextview.cpp ccrystaltextview.h
+ editlib new file: css.cpp
+
2007-02-07 Kimmo
PATCH: [ 1652696 ] Add more options for backup files
Src: FileActionScript.cpp MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2007-02-07 18:37:52 UTC (rev 4099)
+++ trunk/Src/Merge.dsp 2007-02-07 22:03:11 UTC (rev 4100)
@@ -1853,6 +1853,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: trunk/Src/editlib/ccrystaltextview.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextview.cpp 2007-02-07 18:37:52 UTC (rev 4099)
+++ trunk/Src/editlib/ccrystaltextview.cpp 2007-02-07 22:03:11 UTC (rev 4100)
@@ -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: trunk/Src/editlib/ccrystaltextview.h
===================================================================
--- trunk/Src/editlib/ccrystaltextview.h 2007-02-07 18:37:52 UTC (rev 4099)
+++ trunk/Src/editlib/ccrystaltextview.h 2007-02-07 22:03:11 UTC (rev 4100)
@@ -632,6 +632,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);
@@ -710,6 +711,7 @@
SRC_BATCH,
SRC_C,
SRC_CSHARP,
+ SRC_CSS,
SRC_DCL,
SRC_FORTRAN,
SRC_HTML,
Added: trunk/Src/editlib/css.cpp
===================================================================
--- trunk/Src/editlib/css.cpp (rev 0)
+++ trunk/Src/editlib/css.cpp 2007-02-07 22:03:11 UTC (rev 4100)
@@ -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-02-08 16:43:23
|
Revision: 4101
http://svn.sourceforge.net/winmerge/?rev=4101&view=rev
Author: kimmov
Date: 2007-02-08 08:43:17 -0800 (Thu, 08 Feb 2007)
Log Message:
-----------
Add accelerator keys to new Backup options dialog
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/Brazilian/MergeBrazilian.rc
trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
trunk/Src/Languages/Catalan/MergeCatalan.rc
trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
trunk/Src/Languages/Czech/MergeCzech.rc
trunk/Src/Languages/Danish/MergeDanish.rc
trunk/Src/Languages/Dutch/MergeDutch.rc
trunk/Src/Languages/French/MergeFrench.rc
trunk/Src/Languages/German/MergeGerman.rc
trunk/Src/Languages/Hungarian/MergeHungarian.rc
trunk/Src/Languages/Italian/MergeItalian.rc
trunk/Src/Languages/Japanese/MergeJapanese.rc
trunk/Src/Languages/Korean/MergeKorean.rc
trunk/Src/Languages/Norwegian/MergeNorwegian.rc
trunk/Src/Languages/Polish/MergePolish.rc
trunk/Src/Languages/Russian/MergeRussian.rc
trunk/Src/Languages/Slovak/MergeSlovak.rc
trunk/Src/Languages/Spanish/MergeSpanish.rc
trunk/Src/Languages/Swedish/MergeSwedish.rc
trunk/Src/Languages/Turkish/MergeTurkish.rc
trunk/Src/Merge.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-07 22:03:11 UTC (rev 4100)
+++ trunk/Src/Changes.txt 2007-02-08 16:43:17 UTC (rev 4101)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-02-08 Kimmo
+ Add accelerator keys to new Backup options dialog
+ Src: Merge.rc
+ Src/Languages/*: Merge*.rc
+
2007-02-07 Tim
PATCH: [ 1582537 ] CSS syntax highlighter
Src: Merge.dsp
Modified: trunk/Src/Languages/Brazilian/MergeBrazilian.rc
===================================================================
--- trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2007-02-07 22:03:11 UTC (rev 4100)
+++ trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2007-02-08 16:43:17 UTC (rev 4101)
@@ -1576,21 +1576,21 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
- CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
- CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
- CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
- CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
BS_AUTORADIOBUTTON,17,59,212,10
EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
- CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
- CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
Modified: trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-02-07 22:03:11 UTC (rev 4100)
+++ trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-02-08 16:43:17 UTC (rev 4101)
@@ -1576,21 +1576,21 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
- CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
- CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
- CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
- CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
BS_AUTORADIOBUTTON,17,59,212,10
EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
- CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
- CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-02-07 22:03:11 UTC (rev 4100)
+++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-02-08 16:43:17 UTC (rev 4101)
@@ -1576,21 +1576,21 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
- CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
- CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
- CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
- CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
BS_AUTORADIOBUTTON,17,59,212,10
EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
- CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
- CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
Modified: trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
===================================================================
--- trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-02-07 22:03:11 UTC (rev 4100)
+++ trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-02-08 16:43:17 UTC (rev 4101)
@@ -1577,21 +1577,21 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
- CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
- CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
- CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
- CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
BS_AUTORADIOBUTTON,17,59,212,10
EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
- CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
- CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
Modified: trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
===================================================================
--- trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2007-02-07 22:03:11 UTC (rev 4100)
+++ trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2007-02-08 16:43:17 UTC (rev 4101)
@@ -1576,21 +1576,21 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
- CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
- CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
- CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
- CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
BS_AUTORADIOBUTTON,17,59,212,10
EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
- CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
- CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
Modified: trunk/Src/Languages/Czech/MergeCzech.rc
===================================================================
--- trunk/Src/Languages/Czech/MergeCzech.rc 2007-02-07 22:03:11 UTC (rev 4100)
+++ trunk/Src/Languages/Czech/MergeCzech.rc 2007-02-08 16:43:17 UTC (rev 4101)
@@ -1576,21 +1576,21 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
- CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
- CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
- CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
- CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
BS_AUTORADIOBUTTON,17,59,212,10
EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
- CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
- CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
Modified: trunk/Src/Languages/Danish/MergeDanish.rc
===================================================================
--- trunk/Src/Languages/Danish/MergeDanish.rc 2007-02-07 22:03:11 UTC (rev 4100)
+++ trunk/Src/Languages/Danish/MergeDanish.rc 2007-02-08 16:43:17 UTC (rev 4101)
@@ -1576,21 +1576,21 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
- CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
- CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
- CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
- CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
BS_AUTORADIOBUTTON,17,59,212,10
EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
- CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
- CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
Modified: trunk/Src/Languages/Dutch/MergeDutch.rc
===================================================================
--- trunk/Src/Languages/Dutch/MergeDutch.rc 2007-02-07 22:03:11 UTC (rev 4100)
+++ trunk/Src/Languages/Dutch/MergeDutch.rc 2007-02-08 16:43:17 UTC (rev 4101)
@@ -1570,6 +1570,31 @@
PUSHBUTTON "Save...",IDC_PROJ_SAVE,265,103,50,14
END
+IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Backup Files"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
+ CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
+ CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
+ LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
+ CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
+ CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ BS_AUTORADIOBUTTON,17,59,212,10
+ EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
+ CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
+ CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
+END
+
+
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/Src/Languages/French/MergeFrench.rc
===================================================================
--- trunk/Src/Languages/French/MergeFrench.rc 2007-02-07 22:03:11 UTC (rev 4100)
+++ trunk/Src/Languages/French/MergeFrench.rc 2007-02-08 16:43:17 UTC (rev 4101)
@@ -1574,21 +1574,21 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
- CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
- CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
- CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
- CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
BS_AUTORADIOBUTTON,17,59,212,10
EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
- CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
- CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
Modified: trunk/Src/Languages/German/MergeGerman.rc
===================================================================
--- trunk/Src/Languages/German/MergeGerman.rc 2007-02-07 22:03:11 UTC (rev 4100)
+++ trunk/Src/Languages/German/MergeGerman.rc 2007-02-08 16:43:17 UTC (rev 4101)
@@ -1576,21 +1576,21 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
- CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
- CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
- CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
- CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
BS_AUTORADIOBUTTON,17,59,212,10
EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
- CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
- CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
Modified: trunk/Src/Languages/Hungarian/MergeHungarian.rc
===================================================================
--- trunk/Src/Languages/Hungarian/MergeHungarian.rc 2007-02-07 22:03:11 UTC (rev 4100)
+++ trunk/Src/Languages/Hungarian/MergeHungarian.rc 2007-02-08 16:43:17 UTC (rev 4101)
@@ -1574,21 +1574,21 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
- CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
- CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
- CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
- CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
BS_AUTORADIOBUTTON,17,59,212,10
EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
- CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
- CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
Modified: trunk/Src/Languages/Italian/MergeItalian.rc
===================================================================
--- trunk/Src/Languages/Italian/MergeItalian.rc 2007-02-07 22:03:11 UTC (rev 4100)
+++ trunk/Src/Languages/Italian/MergeItalian.rc 2007-02-08 16:43:17 UTC (rev 4101)
@@ -1576,21 +1576,21 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
- CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
- CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
- CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
- CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
BS_AUTORADIOBUTTON,17,59,212,10
EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
- CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
- CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
Modified: trunk/Src/Languages/Japanese/MergeJapanese.rc
===================================================================
--- trunk/Src/Languages/Japanese/MergeJapanese.rc 2007-02-07 22:03:11 UTC (rev 4100)
+++ trunk/Src/Languages/Japanese/MergeJapanese.rc 2007-02-08 16:43:17 UTC (rev 4101)
@@ -1576,21 +1576,21 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
- CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
- CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
- CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
- CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
BS_AUTORADIOBUTTON,17,59,212,10
EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
- CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
- CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
Modified: trunk/Src/Languages/Korean/MergeKorean.rc
===================================================================
--- trunk/Src/Languages/Korean/MergeKorean.rc 2007-02-07 22:03:11 UTC (rev 4100)
+++ trunk/Src/Languages/Korean/MergeKorean.rc 2007-02-08 16:43:17 UTC (rev 4101)
@@ -1576,21 +1576,21 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
- CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
- CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
- CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
- CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
BS_AUTORADIOBUTTON,17,59,212,10
EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
- CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
- CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
Modified: trunk/Src/Languages/Norwegian/MergeNorwegian.rc
===================================================================
--- trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2007-02-07 22:03:11 UTC (rev 4100)
+++ trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2007-02-08 16:43:17 UTC (rev 4101)
@@ -1576,21 +1576,21 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
- CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
- CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
- CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
- CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
BS_AUTORADIOBUTTON,17,59,212,10
EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
- CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
- CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
Modified: trunk/Src/Languages/Polish/MergePolish.rc
===================================================================
--- trunk/Src/Languages/Polish/MergePolish.rc 2007-02-07 22:03:11 UTC (rev 4100)
+++ trunk/Src/Languages/Polish/MergePolish.rc 2007-02-08 16:43:17 UTC (rev 4101)
@@ -1576,21 +1576,21 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
- CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
- CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
- CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
- CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
BS_AUTORADIOBUTTON,17,59,212,10
EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
- CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
- CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
Modified: trunk/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- trunk/Src/Languages/Russian/MergeRussian.rc 2007-02-07 22:03:11 UTC (rev 4100)
+++ trunk/Src/Languages/Russian/MergeRussian.rc 2007-02-08 16:43:17 UTC (rev 4101)
@@ -1576,21 +1576,21 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
- CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
- CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
- CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
- CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
BS_AUTORADIOBUTTON,17,59,212,10
EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
- CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
- CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
Modified: trunk/Src/Languages/Slovak/MergeSlovak.rc
===================================================================
--- trunk/Src/Languages/Slovak/MergeSlovak.rc 2007-02-07 22:03:11 UTC (rev 4100)
+++ trunk/Src/Languages/Slovak/MergeSlovak.rc 2007-02-08 16:43:17 UTC (rev 4101)
@@ -1576,21 +1576,21 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
- CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
- CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
- CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
- CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
BS_AUTORADIOBUTTON,17,59,212,10
EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
- CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
- CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
Modified: trunk/Src/Languages/Spanish/MergeSpanish.rc
===================================================================
--- trunk/Src/Languages/Spanish/MergeSpanish.rc 2007-02-07 22:03:11 UTC (rev 4100)
+++ trunk/Src/Languages/Spanish/MergeSpanish.rc 2007-02-08 16:43:17 UTC (rev 4101)
@@ -1576,21 +1576,21 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
- CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
- CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
- CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
- CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
BS_AUTORADIOBUTTON,17,59,212,10
EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
- CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
- CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-02-07 22:03:11 UTC (rev 4100)
+++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-02-08 16:43:17 UTC (rev 4101)
@@ -1576,21 +1576,21 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
- CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
- CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
- CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
- CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
BS_AUTORADIOBUTTON,17,59,212,10
EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
- CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
- CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
Modified: trunk/Src/Languages/Turkish/MergeTurkish.rc
===================================================================
--- trunk/Src/Languages/Turkish/MergeTurkish.rc 2007-02-07 22:03:11 UTC (rev 4100)
+++ trunk/Src/Languages/Turkish/MergeTurkish.rc 2007-02-08 16:43:17 UTC (rev 4101)
@@ -1576,21 +1576,21 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
- CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
- CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
- CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
- CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
BS_AUTORADIOBUTTON,17,59,212,10
EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
- CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
- CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2007-02-07 22:03:11 UTC (rev 4100)
+++ trunk/Src/Merge.rc 2007-02-08 16:43:17 UTC (rev 4101)
@@ -1586,21 +1586,21 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
- CONTROL "Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
- CONTROL "File compare",IDC_BACKUP_FILECMP,"Button",
+ CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
- CONTROL "Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
- CONTROL "Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
BS_AUTORADIOBUTTON,17,59,212,10
EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
- CONTROL "Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
- CONTROL "Append timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
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:49:14
|
Revision: 4103
http://svn.sourceforge.net/winmerge/?rev=4103&view=rev
Author: kimmov
Date: 2007-02-10 10:49:10 -0800 (Sat, 10 Feb 2007)
Log Message:
-----------
PATCH: [ 1650831 ] Polish translation update for WinMerge 2.6.4
- Submitted by dr_prozac
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/Polish/MergePolish.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-10 18:38:06 UTC (rev 4102)
+++ trunk/Src/Changes.txt 2007-02-10 18:49:10 UTC (rev 4103)
@@ -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-02-08 Kimmo
Add accelerator keys to new Backup options dialog
Src: Merge.rc
Modified: trunk/Src/Languages/Polish/MergePolish.rc
===================================================================
--- trunk/Src/Languages/Polish/MergePolish.rc 2007-02-10 18:38:06 UTC (rev 4102)
+++ trunk/Src/Languages/Polish/MergePolish.rc 2007-02-10 18:49:10 UTC (rev 4103)
@@ -177,7 +177,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
MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Okno"
@@ -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
MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Okno"
@@ -341,7 +341,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
@@ -448,7 +448,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
MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "&Okno"
@@ -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
@@ -1138,8 +1138,8 @@
WS_VSCROLL | WS_TABSTOP
CONTROL "&Zatrzymaj po pierwszej r\xF3\xBFnicy",IDC_COMPARE_STOPFIRST,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,202,10
- GROUPBOX "Comments",IDC_STATIC,7,144,221,32
- CONTROL "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button",
+ GROUPBOX "Komentarze",IDC_STATIC,7,144,221,32
+ CONTROL "Komentarze filtra",IDC_FILTERCOMMENTS_CHECK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,15,157,205,10
PUSHBUTTON "Domy\x9Clne",IDC_COMPARE_DEFAULTS,7,189,50,14
END
@@ -1191,7 +1191,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
@@ -1237,7 +1237,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
@@ -1385,7 +1385,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
@@ -1481,7 +1481,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
@@ -1520,7 +1520,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,
@@ -1556,11 +1556,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
@@ -1617,15 +1617,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"
@@ -1774,8 +1774,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
@@ -1979,7 +1979,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
@@ -1990,7 +1990,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."
IDS_RESET_OPTIONS_WARNING
"Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
END
@@ -2021,7 +2021,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
@@ -2035,18 +2035,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
@@ -2295,8 +2295,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
@@ -2304,7 +2304,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_LEFT_ONLY_IN_FMT "Left only: %1"
@@ -2362,8 +2362,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-11 21:34:51
|
Revision: 4104
http://svn.sourceforge.net/winmerge/?rev=4104&view=rev
Author: kimmov
Date: 2007-02-11 13:34:43 -0800 (Sun, 11 Feb 2007)
Log Message:
-----------
Fix compile with VC6 (doesn't have CString::Append() or CString::AppendChar())
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MainFrm.cpp
trunk/Src/PropBackups.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-10 18:49:10 UTC (rev 4103)
+++ trunk/Src/Changes.txt 2007-02-11 21:34:43 UTC (rev 4104)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-02-11 Kimmo
+ Fix compile with VC6 (doesn't have CString::Append() or CString::AppendChar())
+ Src: MainFrm.cpp PropBackups.cpp
+
2007-02-10 Kimmo
PATCH: [ 1650831 ] Polish translation update for WinMerge 2.6.4
Submitted by dr_prozac
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2007-02-10 18:49:10 UTC (rev 4103)
+++ trunk/Src/MainFrm.cpp 2007-02-11 21:34:43 UTC (rev 4104)
@@ -1242,7 +1242,7 @@
}
if (bakPath[bakPath.GetLength() - 1] != '\\')
- bakPath.AppendChar('\\');
+ bakPath += "\\";
BOOL success = FALSE;
if (GetOptionsMgr()->GetBool(OPT_BACKUP_ADD_BAK))
@@ -1257,8 +1257,8 @@
time(&curtime);
CString timestr;
timestr.Format(_T("%d"), curtime);
- filename.AppendChar('-');
- filename.Append(timestr);
+ filename += "-";
+ filename += timestr;
}
// Append filename and extension (+ optional .bak) to path
@@ -1266,9 +1266,9 @@
< MAX_PATH)
{
success = TRUE;
- bakPath.Append(filename);
- bakPath.AppendChar('.');
- bakPath.Append(ext);
+ bakPath += filename;
+ bakPath += ".";
+ bakPath += ext;
}
if (success)
Modified: trunk/Src/PropBackups.cpp
===================================================================
--- trunk/Src/PropBackups.cpp 2007-02-10 18:49:10 UTC (rev 4103)
+++ trunk/Src/PropBackups.cpp 2007-02-11 21:34:43 UTC (rev 4104)
@@ -82,7 +82,7 @@
m_sGlobalFolder.TrimLeft();
m_sGlobalFolder.TrimRight();
if (m_sGlobalFolder[m_sGlobalFolder.GetLength() - 1] != '\\')
- m_sGlobalFolder.AppendChar('\\');
+ m_sGlobalFolder += "\\";
m_pOptionsMgr->SaveOption(OPT_BACKUP_FOLDERCMP, m_bCreateForFolderCmp == TRUE);
m_pOptionsMgr->SaveOption(OPT_BACKUP_FILECMP, m_bCreateForFileCmp == TRUE);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-02-12 16:38:58
|
Revision: 4105
http://svn.sourceforge.net/winmerge/?rev=4105&view=rev
Author: kimmov
Date: 2007-02-12 08:38:41 -0800 (Mon, 12 Feb 2007)
Log Message:
-----------
PATCH: [ 1657664 ] Swedish translation update for Backup options
- Submitted by Hans Eriksson
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/Swedish/MergeSwedish.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-11 21:34:43 UTC (rev 4104)
+++ trunk/Src/Changes.txt 2007-02-12 16:38:41 UTC (rev 4105)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-02-12 Kimmo
+ PATCH: [ 1657664 ] Swedish translation update for Backup options
+ Submitted by Hans Eriksson
+ Src/Languages/Swedish: MergeSwedish.rc
+
2007-02-11 Kimmo
Fix compile with VC6 (doesn't have CString::Append() or CString::AppendChar())
Src: MainFrm.cpp PropBackups.cpp
Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-02-11 21:34:43 UTC (rev 4104)
+++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-02-12 16:38:41 UTC (rev 4105)
@@ -1572,25 +1572,25 @@
IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
-CAPTION "Backup Files"
+CAPTION "Backup p\xE5 filer"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
- CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ LTEXT "Skapa backupfiler i:",IDC_STATIC,7,7,222,8
+ CONTROL "&Katalogj\xE4mf\xF6relse",IDC_BACKUP_FOLDERCMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
- CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",
+ CONTROL "Fil&j\xE4mf\xF6relse",IDC_BACKUP_FILECMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
- LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
- CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ LTEXT "Skapa backupfiler i:",IDC_STATIC,7,40,222,8
+ CONTROL "&Originalfilens katalog",IDC_BACKUP_ORIGFOLD,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
- CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ CONTROL "&Global backupkatalog:",IDC_BACKUP_GLOBALFOLD,"Button",
BS_AUTORADIOBUTTON,17,59,212,10
EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
- PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
- LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
- CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ PUSHBUTTON "Bl\xE4ddra...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Backupfilnamn:",IDC_STATIC,7,89,222,8
+ CONTROL "&L\xE4gg till .bak -suffix",IDC_BACKUP_APPEND_BAK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
- CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ CONTROL "L&\xE4gg till tidsmarkering",IDC_BACKUP_APPEND_TIME,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
@@ -1945,7 +1945,7 @@
IDS_OPTIONSPG_VERSIONCONTROL "Versionskontroll"
IDS_OPTIONSPG_CODEPAGE "Codepage"
IDS_OPTIONSPG_ARCHIVE "Arkivst\xF6d"
- IDS_OPTIONSPG_BACKUPS "Backup Files"
+ IDS_OPTIONSPG_BACKUPS "Backup p\xE5 filer"
END
// WINMERGE CUSTOM STRINGS
@@ -2977,3 +2977,4 @@
#endif
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-02-14 18:26:53
|
Revision: 4108
http://svn.sourceforge.net/winmerge/?rev=4108&view=rev
Author: kimmov
Date: 2007-02-14 10:26:42 -0800 (Wed, 14 Feb 2007)
Log Message:
-----------
PATCH: [ 1659183 ] Add Vista security attributes to manifest files
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/res/WinMerge.exe.manifest
trunk/Src/res/WinMergeU.exe.manifest
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-12 22:23:19 UTC (rev 4107)
+++ trunk/Src/Changes.txt 2007-02-14 18:26:42 UTC (rev 4108)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-02-14 Kimmo
+ PATCH: [ 1659183 ] Add Vista security attributes to manifest files
+ Src/res: WinMerge.exe.manifest WinMergeU.exe.manifest
+
2007-02-12 Kimmo
PATCH: [ 1657664 ] Swedish translation update for Backup options
Submitted by Hans Eriksson
Modified: trunk/Src/res/WinMerge.exe.manifest
===================================================================
--- trunk/Src/res/WinMerge.exe.manifest 2007-02-12 22:23:19 UTC (rev 4107)
+++ trunk/Src/res/WinMerge.exe.manifest 2007-02-14 18:26:42 UTC (rev 4108)
@@ -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: trunk/Src/res/WinMergeU.exe.manifest
===================================================================
--- trunk/Src/res/WinMergeU.exe.manifest 2007-02-12 22:23:19 UTC (rev 4107)
+++ trunk/Src/res/WinMergeU.exe.manifest 2007-02-14 18:26:42 UTC (rev 4108)
@@ -7,7 +7,19 @@
type="win32"
/>
<description>WinMerge Application</description>
- <dependency>
+
+ <!-- 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
type="win32"
@@ -19,4 +31,5 @@
/>
</dependentAssembly>
</dependency>
+ <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
</assembly>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-02-14 20:53:33
|
Revision: 4109
http://svn.sourceforge.net/winmerge/?rev=4109&view=rev
Author: gerundt
Date: 2007-02-14 12:53:28 -0800 (Wed, 14 Feb 2007)
Log Message:
-----------
PATCH: [ 1640274 ] Icons for folder compare popup menu
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/Brazilian/MergeBrazilian.rc
trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
trunk/Src/Languages/Catalan/MergeCatalan.rc
trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
trunk/Src/Languages/Czech/MergeCzech.rc
trunk/Src/Languages/Danish/MergeDanish.rc
trunk/Src/Languages/Dutch/MergeDutch.rc
trunk/Src/Languages/French/MergeFrench.rc
trunk/Src/Languages/German/MergeGerman.rc
trunk/Src/Languages/Hungarian/MergeHungarian.rc
trunk/Src/Languages/Italian/MergeItalian.rc
trunk/Src/Languages/Japanese/MergeJapanese.rc
trunk/Src/Languages/Korean/MergeKorean.rc
trunk/Src/Languages/Norwegian/MergeNorwegian.rc
trunk/Src/Languages/Polish/MergePolish.rc
trunk/Src/Languages/Russian/MergeRussian.rc
trunk/Src/Languages/Slovak/MergeSlovak.rc
trunk/Src/Languages/Spanish/MergeSpanish.rc
trunk/Src/Languages/Swedish/MergeSwedish.rc
trunk/Src/Languages/Turkish/MergeTurkish.rc
trunk/Src/MainFrm.cpp
trunk/Src/Merge.dsp
trunk/Src/Merge.rc
trunk/Src/resource.h
Added Paths:
-----------
trunk/Src/res/both.bmp
trunk/Src/res/left.bmp
trunk/Src/res/left_to_browse.bmp
trunk/Src/res/left_to_right.bmp
trunk/Src/res/move_left_to_browse.bmp
trunk/Src/res/move_right_to_browse.bmp
trunk/Src/res/right.bmp
trunk/Src/res/right_to_browse.bmp
trunk/Src/res/right_to_left.bmp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-14 18:26:42 UTC (rev 4108)
+++ trunk/Src/Changes.txt 2007-02-14 20:53:28 UTC (rev 4109)
@@ -2,6 +2,14 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-02-14 Tim
+ PATCH: [ 1640274 ] Icons for folder compare popup menu
+ Src: MainFrm.cpp Merge.dsp Merge.rc resource.h
+ Src/res new files: both.bmp left.bmp left_to_browse.bmp left_to_right.bmp
+ move_left_to_browse.bmp move_right_to_browse.bmp right.bmp
+ right_to_browse.bmp right_to_left.bmp
+ Src/Languages/*: Merge*.rc
+
2007-02-14 Kimmo
PATCH: [ 1659183 ] Add Vista security attributes to manifest files
Src/res: WinMerge.exe.manifest WinMergeU.exe.manifest
Modified: trunk/Src/Languages/Brazilian/MergeBrazilian.rc
===================================================================
--- trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2007-02-14 18:26:42 UTC (rev 4108)
+++ trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2007-02-14 20:53:28 UTC (rev 4109)
@@ -1717,6 +1717,15 @@
IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp"
IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp"
IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp"
+IDB_LEFT BITMAP "..\\..\\res\\left.bmp"
+IDB_RIGHT BITMAP "..\\..\\res\\right.bmp"
+IDB_BOTH BITMAP "..\\..\\res\\both.bmp"
+IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp"
+IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp"
+IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp"
+IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp"
+IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp"
+IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp"
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-02-14 18:26:42 UTC (rev 4108)
+++ trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-02-14 20:53:28 UTC (rev 4109)
@@ -1734,6 +1734,15 @@
IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp"
IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp"
IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp"
+IDB_LEFT BITMAP "..\\..\\res\\left.bmp"
+IDB_RIGHT BITMAP "..\\..\\res\\right.bmp"
+IDB_BOTH BITMAP "..\\..\\res\\both.bmp"
+IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp"
+IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp"
+IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp"
+IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp"
+IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp"
+IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp"
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-02-14 18:26:42 UTC (rev 4108)
+++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-02-14 20:53:28 UTC (rev 4109)
@@ -1735,6 +1735,15 @@
IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp"
IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp"
IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp"
+IDB_LEFT BITMAP "..\\..\\res\\left.bmp"
+IDB_RIGHT BITMAP "..\\..\\res\\right.bmp"
+IDB_BOTH BITMAP "..\\..\\res\\both.bmp"
+IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp"
+IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp"
+IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp"
+IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp"
+IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp"
+IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp"
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
===================================================================
--- trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-02-14 18:26:42 UTC (rev 4108)
+++ trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-02-14 20:53:28 UTC (rev 4109)
@@ -1718,6 +1718,15 @@
IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp"
IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp"
IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp"
+IDB_LEFT BITMAP "..\\..\\res\\left.bmp"
+IDB_RIGHT BITMAP "..\\..\\res\\right.bmp"
+IDB_BOTH BITMAP "..\\..\\res\\both.bmp"
+IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp"
+IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp"
+IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp"
+IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp"
+IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp"
+IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp"
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
===================================================================
--- trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2007-02-14 18:26:42 UTC (rev 4108)
+++ trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2007-02-14 20:53:28 UTC (rev 4109)
@@ -1717,6 +1717,15 @@
IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp"
IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp"
IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp"
+IDB_LEFT BITMAP "..\\..\\res\\left.bmp"
+IDB_RIGHT BITMAP "..\\..\\res\\right.bmp"
+IDB_BOTH BITMAP "..\\..\\res\\both.bmp"
+IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp"
+IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp"
+IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp"
+IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp"
+IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp"
+IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp"
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/Src/Languages/Czech/MergeCzech.rc
===================================================================
--- trunk/Src/Languages/Czech/MergeCzech.rc 2007-02-14 18:26:42 UTC (rev 4108)
+++ trunk/Src/Languages/Czech/MergeCzech.rc 2007-02-14 20:53:28 UTC (rev 4109)
@@ -1716,6 +1716,15 @@
IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp"
IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp"
IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp"
+IDB_LEFT BITMAP "..\\..\\res\\left.bmp"
+IDB_RIGHT BITMAP "..\\..\\res\\right.bmp"
+IDB_BOTH BITMAP "..\\..\\res\\both.bmp"
+IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp"
+IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp"
+IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp"
+IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp"
+IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp"
+IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp"
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/Src/Languages/Danish/MergeDanish.rc
===================================================================
--- trunk/Src/Languages/Danish/MergeDanish.rc 2007-02-14 18:26:42 UTC (rev 4108)
+++ trunk/Src/Languages/Danish/MergeDanish.rc 2007-02-14 20:53:28 UTC (rev 4109)
@@ -1717,6 +1717,15 @@
IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp"
IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp"
IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp"
+IDB_LEFT BITMAP "..\\..\\res\\left.bmp"
+IDB_RIGHT BITMAP "..\\..\\res\\right.bmp"
+IDB_BOTH BITMAP "..\\..\\res\\both.bmp"
+IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp"
+IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp"
+IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp"
+IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp"
+IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp"
+IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp"
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/Src/Languages/Dutch/MergeDutch.rc
===================================================================
--- trunk/Src/Languages/Dutch/MergeDutch.rc 2007-02-14 18:26:42 UTC (rev 4108)
+++ trunk/Src/Languages/Dutch/MergeDutch.rc 2007-02-14 20:53:28 UTC (rev 4109)
@@ -1717,6 +1717,15 @@
IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp"
IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp"
IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp"
+IDB_LEFT BITMAP "..\\..\\res\\left.bmp"
+IDB_RIGHT BITMAP "..\\..\\res\\right.bmp"
+IDB_BOTH BITMAP "..\\..\\res\\both.bmp"
+IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp"
+IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp"
+IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp"
+IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp"
+IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp"
+IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp"
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/Src/Languages/French/MergeFrench.rc
===================================================================
--- trunk/Src/Languages/French/MergeFrench.rc 2007-02-14 18:26:42 UTC (rev 4108)
+++ trunk/Src/Languages/French/MergeFrench.rc 2007-02-14 20:53:28 UTC (rev 4109)
@@ -1715,6 +1715,15 @@
IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp"
IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp"
IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp"
+IDB_LEFT BITMAP "..\\..\\res\\left.bmp"
+IDB_RIGHT BITMAP "..\\..\\res\\right.bmp"
+IDB_BOTH BITMAP "..\\..\\res\\both.bmp"
+IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp"
+IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp"
+IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp"
+IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp"
+IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp"
+IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp"
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/Src/Languages/German/MergeGerman.rc
===================================================================
--- trunk/Src/Languages/German/MergeGerman.rc 2007-02-14 18:26:42 UTC (rev 4108)
+++ trunk/Src/Languages/German/MergeGerman.rc 2007-02-14 20:53:28 UTC (rev 4109)
@@ -1717,6 +1717,15 @@
IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp"
IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp"
IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp"
+IDB_LEFT BITMAP "..\\..\\res\\left.bmp"
+IDB_RIGHT BITMAP "..\\..\\res\\right.bmp"
+IDB_BOTH BITMAP "..\\..\\res\\both.bmp"
+IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp"
+IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp"
+IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp"
+IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp"
+IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp"
+IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp"
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/Src/Languages/Hungarian/MergeHungarian.rc
===================================================================
--- trunk/Src/Languages/Hungarian/MergeHungarian.rc 2007-02-14 18:26:42 UTC (rev 4108)
+++ trunk/Src/Languages/Hungarian/MergeHungarian.rc 2007-02-14 20:53:28 UTC (rev 4109)
@@ -1715,6 +1715,15 @@
IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp"
IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp"
IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp"
+IDB_LEFT BITMAP "..\\..\\res\\left.bmp"
+IDB_RIGHT BITMAP "..\\..\\res\\right.bmp"
+IDB_BOTH BITMAP "..\\..\\res\\both.bmp"
+IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp"
+IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp"
+IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp"
+IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp"
+IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp"
+IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp"
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/Src/Languages/Italian/MergeItalian.rc
===================================================================
--- trunk/Src/Languages/Italian/MergeItalian.rc 2007-02-14 18:26:42 UTC (rev 4108)
+++ trunk/Src/Languages/Italian/MergeItalian.rc 2007-02-14 20:53:28 UTC (rev 4109)
@@ -1716,6 +1716,15 @@
IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp"
IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp"
IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp"
+IDB_LEFT BITMAP "..\\..\\res\\left.bmp"
+IDB_RIGHT BITMAP "..\\..\\res\\right.bmp"
+IDB_BOTH BITMAP "..\\..\\res\\both.bmp"
+IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp"
+IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp"
+IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp"
+IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp"
+IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp"
+IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp"
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/Src/Languages/Japanese/MergeJapanese.rc
===================================================================
--- trunk/Src/Languages/Japanese/MergeJapanese.rc 2007-02-14 18:26:42 UTC (rev 4108)
+++ trunk/Src/Languages/Japanese/MergeJapanese.rc 2007-02-14 20:53:28 UTC (rev 4109)
@@ -1717,6 +1717,15 @@
IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp"
IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp"
IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp"
+IDB_LEFT BITMAP "..\\..\\res\\left.bmp"
+IDB_RIGHT BITMAP "..\\..\\res\\right.bmp"
+IDB_BOTH BITMAP "..\\..\\res\\both.bmp"
+IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp"
+IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp"
+IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp"
+IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp"
+IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp"
+IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp"
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/Src/Languages/Korean/MergeKorean.rc
===================================================================
--- trunk/Src/Languages/Korean/MergeKorean.rc 2007-02-14 18:26:42 UTC (rev 4108)
+++ trunk/Src/Languages/Korean/MergeKorean.rc 2007-02-14 20:53:28 UTC (rev 4109)
@@ -1717,6 +1717,15 @@
IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp"
IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp"
IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp"
+IDB_LEFT BITMAP "..\\..\\res\\left.bmp"
+IDB_RIGHT BITMAP "..\\..\\res\\right.bmp"
+IDB_BOTH BITMAP "..\\..\\res\\both.bmp"
+IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp"
+IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp"
+IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp"
+IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp"
+IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp"
+IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp"
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/Src/Languages/Norwegian/MergeNorwegian.rc
===================================================================
--- trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2007-02-14 18:26:42 UTC (rev 4108)
+++ trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2007-02-14 20:53:28 UTC (rev 4109)
@@ -1717,6 +1717,15 @@
IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp"
IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp"
IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp"
+IDB_LEFT BITMAP "..\\..\\res\\left.bmp"
+IDB_RIGHT BITMAP "..\\..\\res\\right.bmp"
+IDB_BOTH BITMAP "..\\..\\res\\both.bmp"
+IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp"
+IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp"
+IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp"
+IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp"
+IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp"
+IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp"
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/Src/Languages/Polish/MergePolish.rc
===================================================================
--- trunk/Src/Languages/Polish/MergePolish.rc 2007-02-14 18:26:42 UTC (rev 4108)
+++ trunk/Src/Languages/Polish/MergePolish.rc 2007-02-14 20:53:28 UTC (rev 4109)
@@ -1716,6 +1716,15 @@
IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp"
IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp"
IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp"
+IDB_LEFT BITMAP "..\\..\\res\\left.bmp"
+IDB_RIGHT BITMAP "..\\..\\res\\right.bmp"
+IDB_BOTH BITMAP "..\\..\\res\\both.bmp"
+IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp"
+IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp"
+IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp"
+IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp"
+IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp"
+IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp"
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- trunk/Src/Languages/Russian/MergeRussian.rc 2007-02-14 18:26:42 UTC (rev 4108)
+++ trunk/Src/Languages/Russian/MergeRussian.rc 2007-02-14 20:53:28 UTC (rev 4109)
@@ -1717,6 +1717,15 @@
IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp"
IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp"
IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp"
+IDB_LEFT BITMAP "..\\..\\res\\left.bmp"
+IDB_RIGHT BITMAP "..\\..\\res\\right.bmp"
+IDB_BOTH BITMAP "..\\..\\res\\both.bmp"
+IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp"
+IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp"
+IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp"
+IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp"
+IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp"
+IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp"
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/Src/Languages/Slovak/MergeSlovak.rc
===================================================================
--- trunk/Src/Languages/Slovak/MergeSlovak.rc 2007-02-14 18:26:42 UTC (rev 4108)
+++ trunk/Src/Languages/Slovak/MergeSlovak.rc 2007-02-14 20:53:28 UTC (rev 4109)
@@ -1716,6 +1716,15 @@
IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp"
IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp"
IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp"
+IDB_LEFT BITMAP "..\\..\\res\\left.bmp"
+IDB_RIGHT BITMAP "..\\..\\res\\right.bmp"
+IDB_BOTH BITMAP "..\\..\\res\\both.bmp"
+IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp"
+IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp"
+IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp"
+IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp"
+IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp"
+IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp"
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/Src/Languages/Spanish/MergeSpanish.rc
===================================================================
--- trunk/Src/Languages/Spanish/MergeSpanish.rc 2007-02-14 18:26:42 UTC (rev 4108)
+++ trunk/Src/Languages/Spanish/MergeSpanish.rc 2007-02-14 20:53:28 UTC (rev 4109)
@@ -1716,6 +1716,15 @@
IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp"
IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp"
IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp"
+IDB_LEFT BITMAP "..\\..\\res\\left.bmp"
+IDB_RIGHT BITMAP "..\\..\\res\\right.bmp"
+IDB_BOTH BITMAP "..\\..\\res\\both.bmp"
+IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp"
+IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp"
+IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp"
+IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp"
+IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp"
+IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp"
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-02-14 18:26:42 UTC (rev 4108)
+++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-02-14 20:53:28 UTC (rev 4109)
@@ -1716,6 +1716,15 @@
IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp"
IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp"
IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp"
+IDB_LEFT BITMAP "..\\..\\res\\left.bmp"
+IDB_RIGHT BITMAP "..\\..\\res\\right.bmp"
+IDB_BOTH BITMAP "..\\..\\res\\both.bmp"
+IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp"
+IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp"
+IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp"
+IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp"
+IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp"
+IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp"
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/Src/Languages/Turkish/MergeTurkish.rc
===================================================================
--- trunk/Src/Languages/Turkish/MergeTurkish.rc 2007-02-14 18:26:42 UTC (rev 4108)
+++ trunk/Src/Languages/Turkish/MergeTurkish.rc 2007-02-14 20:53:28 UTC (rev 4109)
@@ -1717,6 +1717,15 @@
IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "..\\..\\res\\next_bookmark.bmp"
IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "..\\..\\res\\prev_bookmark.bmp"
IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "..\\..\\res\\clear_bookmarks.bmp"
+IDB_LEFT BITMAP "..\\..\\res\\left.bmp"
+IDB_RIGHT BITMAP "..\\..\\res\\right.bmp"
+IDB_BOTH BITMAP "..\\..\\res\\both.bmp"
+IDB_LEFT_TO_RIGHT BITMAP "..\\..\\res\\left_to_right.bmp"
+IDB_RIGHT_TO_LEFT BITMAP "..\\..\\res\\right_to_left.bmp"
+IDB_LEFT_TO_BROWSE BITMAP "..\\..\\res\\left_to_browse.bmp"
+IDB_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\right_to_browse.bmp"
+IDB_MOVE_LEFT_TO_BROWSE BITMAP "..\\..\\res\\move_left_to_browse.bmp"
+IDB_MOVE_RIGHT_TO_BROWSE BITMAP "..\\..\\res\\move_right_to_browse.bmp"
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2007-02-14 18:26:42 UTC (rev 4108)
+++ trunk/Src/MainFrm.cpp 2007-02-14 20:53:28 UTC (rev 4109)
@@ -506,6 +506,21 @@
m_pMenus[MENU_DIRVIEW]->ModifyODMenu(NULL, ID_MERGE_DELETE, IDB_MERGE_DELETE);
m_pMenus[MENU_DIRVIEW]->ModifyODMenu(NULL, ID_TOOLS_GENERATEPATCH, IDB_TOOLS_GENERATEPATCH);
m_pMenus[MENU_DIRVIEW]->ModifyODMenu(NULL, ID_TOOLS_GENERATEREPORT, IDB_TOOLS_GENERATEREPORT);
+ m_pMenus[MENU_DIRVIEW]->ModifyODMenu(NULL, ID_DIR_COPY_LEFT_TO_RIGHT, IDB_LEFT_TO_RIGHT);
+ m_pMenus[MENU_DIRVIEW]->ModifyODMenu(NULL, ID_DIR_COPY_RIGHT_TO_LEFT, IDB_RIGHT_TO_LEFT);
+ m_pMenus[MENU_DIRVIEW]->ModifyODMenu(NULL, ID_DIR_COPY_LEFT_TO_BROWSE, IDB_LEFT_TO_BROWSE);
+ m_pMenus[MENU_DIRVIEW]->ModifyODMenu(NULL, ID_DIR_COPY_RIGHT_TO_BROWSE, IDB_RIGHT_TO_BROWSE);
+ m_pMenus[MENU_DIRVIEW]->ModifyODMenu(NULL, ID_DIR_MOVE_LEFT_TO_BROWSE, IDB_MOVE_LEFT_TO_BROWSE);
+ m_pMenus[MENU_DIRVIEW]->ModifyODMenu(NULL, ID_DIR_MOVE_RIGHT_TO_BROWSE, IDB_MOVE_RIGHT_TO_BROWSE);
+ m_pMenus[MENU_DIRVIEW]->ModifyODMenu(NULL, ID_DIR_DEL_LEFT, IDB_LEFT);
+ m_pMenus[MENU_DIRVIEW]->ModifyODMenu(NULL, ID_DIR_DEL_RIGHT, IDB_RIGHT);
+ m_pMenus[MENU_DIRVIEW]->ModifyODMenu(NULL, ID_DIR_DEL_BOTH, IDB_BOTH);
+ m_pMenus[MENU_DIRVIEW]->ModifyODMenu(NULL, ID_DIR_COPY_PATHNAMES_LEFT, IDB_LEFT);
+ m_pMenus[MENU_DIRVIEW]->ModifyODMenu(NULL, ID_DIR_COPY_PATHNAMES_RIGHT, IDB_RIGHT);
+ m_pMenus[MENU_DIRVIEW]->ModifyODMenu(NULL, ID_DIR_COPY_PATHNAMES_BOTH, IDB_BOTH);
+ m_pMenus[MENU_DIRVIEW]->ModifyODMenu(NULL, ID_DIR_ZIP_LEFT, IDB_LEFT);
+ m_pMenus[MENU_DIRVIEW]->ModifyODMenu(NULL, ID_DIR_ZIP_RIGHT, IDB_RIGHT);
+ m_pMenus[MENU_DIRVIEW]->ModifyODMenu(NULL, ID_DIR_ZIP_BOTH, IDB_BOTH);
m_pMenus[MENU_DIRVIEW]->LoadToolbar(IDR_MAINFRAME);
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2007-02-14 18:26:42 UTC (rev 4108)
+++ trunk/Src/Merge.dsp 2007-02-14 20:53:28 UTC (rev 4109)
@@ -1581,6 +1581,10 @@
# End Source File
# Begin Source File
+SOURCE=.\res\both.bmp
+# End Source File
+# Begin Source File
+
SOURCE=.\res\equal.bmp
# End Source File
# Begin Source File
@@ -1637,6 +1641,18 @@
# End Source File
# Begin Source File
+SOURCE=.\res\left.bmp
+# End Source File
+# Begin Source File
+
+SOURCE=.\res\left_to_browse.bmp
+# End Source File
+# Begin Source File
+
+SOURCE=.\res\left_to_right.bmp
+# End Source File
+# Begin Source File
+
SOURCE=.\res\lfile.bmp
# End Source File
# Begin Source File
@@ -1673,6 +1689,14 @@
# End Source File
# Begin Source File
+SOURCE=.\res\move_left_to_browse.bmp
+# End Source File
+# Begin Source File
+
+SOURCE=.\res\move_right_to_browse.bmp
+# End Source File
+# Begin Source File
+
SOURCE=.\res\notequal.bmp
# End Source File
# Begin Source File
@@ -1697,6 +1721,18 @@
# End Source File
# Begin Source File
+SOURCE=.\res\right.bmp
+# End Source File
+# Begin Source File
+
+SOURCE=.\res\right_to_browse.bmp
+# End Source File
+# Begin Source File
+
+SOURCE=.\res\right_to_left.bmp
+# End Source File
+# Begin Source File
+
SOURCE=.\res\sigma.bmp
# End Source File
# Begin Source File
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2007-02-14 18:26:42 UTC (rev 4108)
+++ trunk/Src/Merge.rc 2007-02-14 20:53:28 UTC (rev 4109)
@@ -1727,6 +1727,15 @@
IDB_EDIT_GOTO_NEXT_BOOKMARK BITMAP "res\\next_bookmark.bmp"
IDB_EDIT_GOTO_PREV_BOOKMARK BITMAP "res\\prev_bookmark.bmp"
IDB_EDIT_CLEAR_ALL_BOOKMARKS BITMAP "res\\clear_bookmarks.bmp"
+IDB_LEFT BITMAP "res\\left.bmp"
+IDB_RIGHT BITMAP "res\\right.bmp"
+IDB_BOTH BITMAP "res\\both.bmp"
+IDB_LEFT_TO_RIGHT BITMAP "res\\left_to_right.bmp"
+IDB_RIGHT_TO_LEFT BITMAP "res\\right_to_left.bmp"
+IDB_LEFT_TO_BROWSE BITMAP "res\\left_to_browse.bmp"
+IDB_RIGHT_TO_BROWSE BITMAP "res\\right_to_browse.bmp"
+IDB_MOVE_LEFT_TO_BROWSE BITMAP "res\\move_left_to_browse.bmp"
+IDB_MOVE_RIGHT_TO_BROWSE BITMAP "res\\move_right_to_browse.bmp"
/////////////////////////////////////////////////////////////////////////////
Added: trunk/Src/res/both.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/Src/res/both.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/Src/res/left.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/Src/res/left.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/Src/res/left_to_browse.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/Src/res/left_to_browse.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/Src/res/left_to_right.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/Src/res/left_to_right.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/Src/res/move_left_to_browse.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/Src/res/move_left_to_browse.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/Src/res/move_right_to_browse.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/Src/res/move_right_to_browse.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/Src/res/right.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/Src/res/right.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/Src/res/right_to_browse.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/Src/res/right_to_browse.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/Src/res/right_to_left.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/Src/res/right_to_left.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2007-02-14 18:26:42 UTC (rev 4108)
+++ trunk/Src/resource.h 2007-02-14 20:53:28 UTC (rev 4109)
@@ -84,6 +84,15 @@
#define IDB_EDIT_CLEAR_ALL_BOOKMARKS 345
#define IDB_TOOLBAR_ENABLED 100 // = IDR_MAINFRAME
#define IDB_TOOLBAR_DISABLED 346
+#define IDB_LEFT 347
+#define IDB_RIGHT 348
+#define IDB_BOTH 349
+#define IDB_LEFT_TO_RIGHT 350
+#define IDB_RIGHT_TO_LEFT 351
+#define IDB_LEFT_TO_BROWSE 352
+#define IDB_RIGHT_TO_BROWSE 353
+#define IDB_MOVE_LEFT_TO_BROWSE 354
+#define IDB_MOVE_RIGHT_TO_BROWSE 355
#define IDI_FOLDER 500
#define IDI_LFOLDER 501
#define IDI_RFOLDER 502
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-02-17 10:09:44
|
Revision: 4110
http://svn.sourceforge.net/winmerge/?rev=4110&view=rev
Author: kimmov
Date: 2007-02-17 02:09:39 -0800 (Sat, 17 Feb 2007)
Log Message:
-----------
PATCH: [ 1662002 ] Use two threads for folder compare
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DiffContext.cpp
trunk/Src/DiffContext.h
trunk/Src/DiffThread.cpp
trunk/Src/DiffThread.h
trunk/Src/DirScan.cpp
trunk/Src/DirScan.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-14 20:53:28 UTC (rev 4109)
+++ trunk/Src/Changes.txt 2007-02-17 10:09:39 UTC (rev 4110)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-02-17 Kimmo
+ PATCH: [ 1662002 ] Use two threads for folder compare
+ Src: Diffcontext.cpp Diffcontext.h DiffThread.cpp DiffThread.h DirScan.cpp
+ DirScan.h
+
2007-02-14 Tim
PATCH: [ 1640274 ] Icons for folder compare popup menu
Src: MainFrm.cpp Merge.dsp Merge.rc resource.h
Modified: trunk/Src/DiffContext.cpp
===================================================================
--- trunk/Src/DiffContext.cpp 2007-02-14 20:53:28 UTC (rev 4109)
+++ trunk/Src/DiffContext.cpp 2007-02-17 10:09:39 UTC (rev 4110)
@@ -68,9 +68,11 @@
, m_piAbortable(NULL)
, m_bStopAfterFirstDiff(FALSE)
, m_pFilterList(NULL)
+, m_bCollectReady(FALSE)
{
m_paths.SetLeft(pszLeft);
m_paths.SetRight(pszRight);
+ InitializeCriticalSection(&m_criticalSect);
}
/**
@@ -97,11 +99,18 @@
m_bIgnoreSmallTimeDiff = src.m_bIgnoreSmallTimeDiff;
m_bStopAfterFirstDiff = src.m_bStopAfterFirstDiff;
m_pFilterList = src.m_pFilterList;
+ m_bCollectReady = src.m_bCollectReady;
+
+ EnterCriticalSection(&src.m_criticalSect);
+ InitializeCriticalSection(&m_criticalSect);
+ LeaveCriticalSection(&src.m_criticalSect);
+ DeleteCriticalSection(&src.m_criticalSect);
}
CDiffContext::~CDiffContext()
{
delete m_pFilterList;
+ DeleteCriticalSection(&m_criticalSect);
}
/**
Modified: trunk/Src/DiffContext.h
===================================================================
--- trunk/Src/DiffContext.h 2007-02-14 20:53:28 UTC (rev 4109)
+++ trunk/Src/DiffContext.h 2007-02-17 10:09:39 UTC (rev 4110)
@@ -31,11 +31,12 @@
class FilterList;
// Interface for reporting current file, as diff traverses file tree
-class IDiffStatus
+/*class IDiffStatus
{
public:
virtual void rptFile(BYTE code)=0;
};
+*/
/** Interface to a provider of plugin info */
class IPluginInfos
@@ -99,6 +100,8 @@
BOOL m_bStopAfterFirstDiff; /**< Optimize compare by stopping after first difference? */
int m_nQuickCompareLimit; /**< Bigger files are always compared with quick compare */
FilterList * m_pFilterList; /**< Filter list for line filters */
+ CRITICAL_SECTION m_criticalSect; /**< Critical section protecting list access. */
+ BOOL m_bCollectReady; /**< Tells collection phase is done. */
private:
CList<DIFFITEM,DIFFITEM&> *m_pList; /**< Pointer to list, used to access list */
Modified: trunk/Src/DiffThread.cpp
===================================================================
--- trunk/Src/DiffThread.cpp 2007-02-14 20:53:28 UTC (rev 4109)
+++ trunk/Src/DiffThread.cpp 2007-02-17 10:09:39 UTC (rev 4110)
@@ -24,9 +24,7 @@
#include "stdafx.h"
#include "diffcontext.h"
-#include "FilterList.h"
#include "diffthread.h"
-#include "diff.h"
#include "DirScan.h"
#include "Plugins.h"
#include "DiffItemList.h"
@@ -39,9 +37,10 @@
// Either edit this line, or breakpoint & change it in CompareDirectories() below
static bool bSinglethreaded=false;
-
/**
- * @brief Data sent to diff thread
+ * @brief Structure used in sending data to the threads.
+ * As thread functions have only one parameter we must pack all
+ * the data we need inside structure.
*/
struct DiffFuncStruct
{
@@ -54,14 +53,17 @@
BOOL bRecursive;
DiffThreadAbortable * m_pAbortgate;
bool bOnlyRequested;
+ DiffItemList *pItemList;
+
DiffFuncStruct()
- : context(0)
+ : context(NULL)
, msgUIUpdate(0)
, hWindow(0)
, nThreadState(THREAD_NOTSTARTED)
, bRecursive(FALSE)
- , m_pAbortgate(0)
+ , m_pAbortgate(NULL)
, bOnlyRequested(false)
+ , pItemList(NULL)
{}
};
@@ -84,11 +86,11 @@
*/
CDiffThread::CDiffThread()
: m_pDiffContext(NULL)
-, m_thread(NULL)
, m_msgUpdateUI(0)
, m_hWnd(0)
, m_bAborting(FALSE)
{
+ ZeroMemory(&m_threads[0], sizeof(m_threads));
m_pDiffParm = new DiffFuncStruct;
m_pAbortgate = new DiffThreadAbortable(this);
}
@@ -123,17 +125,20 @@
m_pDiffParm->hWindow = m_hWnd;
m_pDiffParm->m_pAbortgate = m_pAbortgate;
m_pDiffParm->bOnlyRequested = m_bOnlyRequested;
+ m_pDiffParm->pItemList = &m_diffList;
m_bAborting = FALSE;
m_pDiffParm->nThreadState = THREAD_COMPARING;
if (bSinglethreaded)
{
- DiffThread(m_pDiffParm);
+ DiffThreadCollect(m_pDiffParm);
+ DiffThreadCompare(m_pDiffParm);
}
else
{
- m_thread = AfxBeginThread(DiffThread, m_pDiffParm);
+ m_threads[0] = AfxBeginThread(DiffThreadCollect, m_pDiffParm);
+ m_threads[1] = AfxBeginThread(DiffThreadCompare, m_pDiffParm);
}
return 1;
@@ -173,19 +178,21 @@
}
/**
- * @brief Directory compare thread function
+ * @brief Item collection thread function.
*
- * Calls diffutils's compare_files() and after compare is ready
- * sends message to UI so UI can update itself.
+ * This thread is responsible for finding and collecting all items to compare
+ * to the item list.
+ * @param [in] lParam Pointer to parameter structure.
+ * @return Thread's return value.
*/
-UINT DiffThread(LPVOID lpParam)
+UINT DiffThreadCollect(LPVOID lpParam)
{
- DiffItemList itemList;
PathContext paths;
DiffFuncStruct *myStruct = (DiffFuncStruct *) lpParam;
HWND hWnd = myStruct->hWindow;
UINT msgID = myStruct->msgUIUpdate;
bool bOnlyRequested = myStruct->bOnlyRequested;
+ myStruct->context->m_bCollectReady = FALSE;
// Stash abortable interface into context
myStruct->context->SetAbortable(myStruct->m_pAbortgate);
@@ -217,21 +224,62 @@
#endif
// Build results list (except delaying file comparisons until below)
- DirScan_GetItems(paths, subdir, subdir, &itemList, casesensitive, depth, myStruct->context);
+ DirScan_GetItems(paths, subdir, subdir, myStruct->pItemList, casesensitive, depth, myStruct->context);
#ifdef _DEBUG
_CrtMemCheckpoint(&memStateAfter);
_CrtMemDifference(&memStateDiff, &memStateBefore, &memStateAfter);
_CrtMemDumpStatistics(&memStateDiff);
#endif
+ }
+
+ // Signal that collect phase is ready
+ myStruct->context->m_bCollectReady = TRUE;
+ return 1;
+}
+
+
+/**
+ * @brief Folder compare thread function.
+ *
+ * Compares items in item list. After compare is ready
+ * sends message to UI so UI can update itself.
+ * @param [in] lParam Pointer to parameter structure.
+ * @return Thread's return value.
+ */
+UINT DiffThreadCompare(LPVOID lpParam)
+{
+ DiffFuncStruct *myStruct = (DiffFuncStruct *) lpParam;
+ HWND hWnd = myStruct->hWindow;
+ UINT msgID = myStruct->msgUIUpdate;
+ bool bOnlyRequested = myStruct->bOnlyRequested;
+
+ // Stash abortable interface into context
+ myStruct->context->SetAbortable(myStruct->m_pAbortgate);
+
+ // keep the scripts alive during the Rescan
+ // when we exit the thread, we delete this and release the scripts
+ CAssureScriptsForThread scriptsForRescan;
+
+ if (bOnlyRequested)
+ {
myStruct->context->m_pCompareStats->SetCompareState(CompareStats::STATE_COMPARE);
+ DirScan_CompareItems(myStruct->context);
+ myStruct->context->m_pCompareStats->SetCompareState(CompareStats::STATE_IDLE);
+ }
+ else
+ {
+ myStruct->context->m_pCompareStats->SetCompareState(CompareStats::STATE_COMPARE);
// Now do all pending file comparisons
- DirScan_CompareItems(itemList, myStruct->context);
+ DirScan_CompareItems(myStruct->pItemList, myStruct->context);
myStruct->context->m_pCompareStats->SetCompareState(CompareStats::STATE_IDLE);
}
+ // Clear the list - its job is now done
+ myStruct->pItemList->RemoveAll();
+
// Send message to UI to update
myStruct->nThreadState = THREAD_COMPLETED;
// msgID=MSG_UI_UPDATE=1025 (2005-11-29, Perry)
Modified: trunk/Src/DiffThread.h
===================================================================
--- trunk/Src/DiffThread.h 2007-02-14 20:53:28 UTC (rev 4109)
+++ trunk/Src/DiffThread.h 2007-02-17 10:09:39 UTC (rev 4110)
@@ -31,19 +31,22 @@
class DiffThreadAbortable;
/**
- * @brief Thread's statuses
+ * @brief Thread's statuses.
*/
enum
{
THREAD_NOTSTARTED = 0,
THREAD_COMPARING,
- THREAD_COMPLETED
+ THREAD_COMPLETED,
};
/**
- * @brief Class for threaded directory compare
- * This class takes care of starting directory compare thread
+ * @brief Class for threaded folder compare.
+ * This class implements folder compare in two phases and in two threads:
+ * - first thread collects items to compare to compare-time list
+ * (m_diffList).
+ * - second threads compares items in the list.
*/
class CDiffThread
{
@@ -65,18 +68,20 @@
// runtime interface for child thread, called on child thread
bool ShouldAbort() const { return m_bAborting; }
-
private:
- CDiffContext * m_pDiffContext;
- CWinThread * m_thread;
- DiffFuncStruct * m_pDiffParm;
+ CDiffContext * m_pDiffContext; /**< Compare context storing results. */
+ CWinThread * m_threads[2]; /**< Compare threads. */
+ DiffFuncStruct * m_pDiffParm; /**< Structure for sending data to threads. */
DiffThreadAbortable * m_pAbortgate;
- UINT m_msgUpdateUI;
- HWND m_hWnd;
- bool m_bAborting;
- bool m_bOnlyRequested;
+ DiffItemList m_diffList; /**< Compare-time list for compared items. */
+ UINT m_msgUpdateUI; /**< UI-update message number */
+ HWND m_hWnd; /**< Handle to folder compare GUI window */
+ bool m_bAborting; /**< Is compare aborting? */
+ bool m_bOnlyRequested; /**< Are we comparing only requested items (Update?) */
};
-UINT DiffThread(LPVOID lpParam);
+// Thread functions
+UINT DiffThreadCollect(LPVOID lpParam);
+UINT DiffThreadCompare(LPVOID lpParam);
#endif /* _DIFFTHREAD_H */
\ No newline at end of file
Modified: trunk/Src/DirScan.cpp
===================================================================
--- trunk/Src/DirScan.cpp 2007-02-14 20:53:28 UTC (rev 4109)
+++ trunk/Src/DirScan.cpp 2007-02-17 10:09:39 UTC (rev 4110)
@@ -253,14 +253,30 @@
*
* @param list [in] List of items to compare
* @param pCtxt [in,out] Compare context: contains list where results are added.
- * @param piAbortable [in] Interface allowing to abort compare
* @return 1 if compare finished, -1 if compare was aborted
*/
-int DirScan_CompareItems(DiffItemList & list, CDiffContext * pCtxt)
+int DirScan_CompareItems(DiffItemList * list, CDiffContext * pCtxt)
{
int res = 1;
- POSITION pos = list.GetFirstDiffPosition();
+ POSITION pos = NULL;
+ POSITION prevPos = NULL;
+
+ EnterCriticalSection(&pCtxt->m_criticalSect);
+ pos = list->GetFirstDiffPosition();
+ LeaveCriticalSection(&pCtxt->m_criticalSect);
+ // Wait until we have items in list
+ while (pos == NULL)
+ {
+ Sleep(100);
+ EnterCriticalSection(&pCtxt->m_criticalSect);
+ pos = list->GetFirstDiffPosition();
+ LeaveCriticalSection(&pCtxt->m_criticalSect);
+ if (pCtxt->m_bCollectReady == TRUE)
+ break;
+ }
+
+ // Compare whole list
while (pos != NULL)
{
if (pCtxt->ShouldAbort())
@@ -269,9 +285,58 @@
break;
}
- DIFFITEM di = list.GetNextDiffPosition(pos);
+ prevPos = pos;
+ EnterCriticalSection(&pCtxt->m_criticalSect);
+ DIFFITEM di = list->GetNextDiffPosition(pos);
+ LeaveCriticalSection(&pCtxt->m_criticalSect);
CompareDiffItem(di, pCtxt);
+
+ // Some compare methdods can be faster than collecting,
+ // so we can reach the end of list while collect is running.
+ // In this case we must wait for a while for new items to be
+ // added to the list.
+ if (pos == NULL && pCtxt->m_bCollectReady == FALSE)
+ {
+ do
+ {
+ pos = prevPos;
+ Sleep(200);
+ EnterCriticalSection(&pCtxt->m_criticalSect);
+ list->GetNextDiffPosition(pos);
+ LeaveCriticalSection(&pCtxt->m_criticalSect);
+ } while (pos == NULL);
+ }
}
+
+ // Loop above may not catch all items yet, consider this case:
+ // - we get latest item at the moment (pos is returned as NULL)
+ // - compare takes a while (big file / slow media) and new item
+ // is added to the list while comparing
+ // - m_bCollectReady is set to TRUE
+ // Now we would end the loop, while there are still items in the list.
+ // So to be sure, lets try again with "last" item, if there are more
+ // items!
+ EnterCriticalSection(&pCtxt->m_criticalSect);
+ list->GetNextDiffPosition(prevPos);
+ LeaveCriticalSection(&pCtxt->m_criticalSect);
+
+ if (prevPos != NULL)
+ {
+ pos = prevPos;
+ while (pos != NULL)
+ {
+ if (pCtxt->ShouldAbort())
+ {
+ res = -1;
+ break;
+ }
+ EnterCriticalSection(&pCtxt->m_criticalSect);
+ DIFFITEM di = list->GetNextDiffPosition(pos);
+ LeaveCriticalSection(&pCtxt->m_criticalSect);
+ CompareDiffItem(di, pCtxt);
+ }
+ }
+
return res;
}
@@ -279,7 +344,6 @@
* @brief Compare DiffItems in context marked for rescan.
*
* @param pCtxt [in,out] Compare context: contains list of items.
- * @param piAbortable [in] Interface allowing to abort compare
* @return 1 if compare finished, -1 if compare was aborted
*/
int DirScan_CompareItems(CDiffContext * pCtxt)
@@ -641,6 +705,7 @@
CLogFile::LCOMPAREDATA, _T("name=<%s>, leftdir=<%s>, rightdir=<%s>, code=%d"),
(LPCTSTR)di.sLeftFilename, (LPCTSTR)_T("di.left.spath"), (LPCTSTR)_T("di.right.spath"), di.diffcode
);
+
pCtxt->AddDiff(di);
}
@@ -698,7 +763,10 @@
(LPCTSTR)di.sLeftFilename, (LPCTSTR)_T("di.left.spath"), (LPCTSTR)_T("di.right.spath"), code
);
pCtxt->m_pCompareStats->IncreaseTotalItems();
+
+ EnterCriticalSection(&pCtxt->m_criticalSect);
pList->AddDiff(di);
+ LeaveCriticalSection(&pCtxt->m_criticalSect);
}
void // static
Modified: trunk/Src/DirScan.h
===================================================================
--- trunk/Src/DirScan.h 2007-02-14 20:53:28 UTC (rev 4109)
+++ trunk/Src/DirScan.h 2007-02-17 10:09:39 UTC (rev 4110)
@@ -17,7 +17,7 @@
int DirScan_GetItems(const PathContext &paths, const CString & leftsubdir, const CString & rightsubdir, DiffItemList * pLst,
bool casesensitive, int depth, CDiffContext * pCtxt);
-int DirScan_CompareItems(DiffItemList & list, CDiffContext * pCtxt);
+int DirScan_CompareItems(DiffItemList * list, CDiffContext * pCtxt);
int DirScan_CompareItems(CDiffContext * pCtxt);
void DirScan_InitializeDefaultCodepage();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-02-19 16:08:46
|
Revision: 4113
http://svn.sourceforge.net/winmerge/?rev=4113&view=rev
Author: kimmov
Date: 2007-02-19 08:08:41 -0800 (Mon, 19 Feb 2007)
Log Message:
-----------
PATCH: [ 1663012 ] Fix total count for compare progress dialog
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirCompProgressDlg.cpp
trunk/Src/DirCompProgressDlg.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-18 20:15:47 UTC (rev 4112)
+++ trunk/Src/Changes.txt 2007-02-19 16:08:41 UTC (rev 4113)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-02-19 Kimmo
+ PATCH: [ 1663012 ] Fix total count for compare progress dialog
+ Src: DirCompProgressDlg.cpp DirCompProgressDlg.h
+
2007-02-17 Jan Hryz
Czech translation - update
Src/Languages/Czech/MergeCzech.rc
Modified: trunk/Src/DirCompProgressDlg.cpp
===================================================================
--- trunk/Src/DirCompProgressDlg.cpp 2007-02-18 20:15:47 UTC (rev 4112)
+++ trunk/Src/DirCompProgressDlg.cpp 2007-02-19 16:08:41 UTC (rev 4113)
@@ -3,7 +3,7 @@
*
* @brief Implementation file for Directory compare state dialog
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -64,14 +64,6 @@
{
}
-/**
- * @brief Loads strings from resource.
- */
-BOOL DirCompProgressDlg::Create(UINT nIDTemplate, CWnd* pParentWnd)
-{
- return CDialog::Create(nIDTemplate, pParentWnd);
-};
-
void DirCompProgressDlg::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
@@ -89,6 +81,11 @@
/////////////////////////////////////////////////////////////////////////////
+/**
+ * @brief Initialize the dialog.
+ * Center the dialog to main window.
+ * @return TRUE (see the comment inside function).
+ */
BOOL DirCompProgressDlg::OnInitDialog()
{
CDialog::OnInitDialog();
@@ -100,8 +97,11 @@
}
/**
- * @brief Handle WM_KEYDOWN messages before normal processing
- * to allow any key close stateDlg.
+ * @brief Handle Windows messages before normal processing.
+ * Handle WM_KEYDOWN messages before normal processing to allow any key
+ * to stop the compare.
+ * @param [in] pMsg Message to handle.
+ * @return TRUE if message was handled and no more handling is needed.
*/
BOOL DirCompProgressDlg::PreTranslateMessage(MSG* pMsg)
{
@@ -120,6 +120,7 @@
/**
* @brief Set pointer to compare stats.
+ * @param [in] pCompareStats Pointer to stats.
*/
void DirCompProgressDlg::SetCompareStat(CompareStats * pCompareStats)
{
@@ -128,6 +129,8 @@
/**
* @brief Timer message received.
+ * Handle timer messages. When timer fires, update the dialog.
+ * @param [in] nIDEvent ID of the timer that fired.
*/
void DirCompProgressDlg::OnTimer(UINT_PTR nIDEvent)
{
@@ -176,10 +179,15 @@
state == CompareStats::STATE_COMPARE)
{
TCHAR num[15] = {0};
+ const int totalItems = m_pCompareStats->GetTotalItems();
int comparedItems = m_pCompareStats->GetComparedItems();
+ _itot(totalItems, num, 10);
+ pProg->SetRange32(0, totalItems);
+ pTotal->SetWindowText(num);
_itot(comparedItems, num, 10);
pCompared->SetWindowText(num);
pProg->SetPos(comparedItems);
+
}
// Compare is ready
// Update total items too since we might get only this one state
@@ -253,6 +261,7 @@
*
* We need pointer to DirDoc for aborting the scan when Stop
* button is clicked.
+ * @param [in] pDirDoc Pointer to folder compare doc.
*/
void DirCompProgressDlg::SetDirDoc(CDirDoc *pDirDoc)
{
Modified: trunk/Src/DirCompProgressDlg.h
===================================================================
--- trunk/Src/DirCompProgressDlg.h 2007-02-18 20:15:47 UTC (rev 4112)
+++ trunk/Src/DirCompProgressDlg.h 2007-02-19 16:08:41 UTC (rev 4113)
@@ -3,7 +3,7 @@
*
* @brief Declaration file for Directory compare statusdialog class
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#if !defined(AFX_DIRCOMPPROGRESSDLG_H__8F66C090_C232_429F_A4A2_18D43CCC6C38__INCLUDED_)
@@ -32,6 +32,10 @@
* datastructure with compare code. Compare code updates status information
* to datastructure during compare. When timer event fires, dialog reads
* that datastructure and updates the GUI.
+ *
+ * @todo Now we update total count of items with same timer than we update
+ * compared items count. Maybe we should use different timer and bigger
+ * interval for total count updates?
*/
class DirCompProgressDlg : public CDialog
{
@@ -40,7 +44,6 @@
// Construction
public:
DirCompProgressDlg(CWnd* pParent = NULL); // standard constructor
- BOOL Create(UINT nIDTemplate, CWnd* pParentWnd);
void SetCompareStat(CompareStats * pCompareStats);
void StartUpdating();
void EndUpdating();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-02-19 17:24:03
|
Revision: 4115
http://svn.sourceforge.net/winmerge/?rev=4115&view=rev
Author: kimmov
Date: 2007-02-19 09:23:57 -0800 (Mon, 19 Feb 2007)
Log Message:
-----------
PATCH: [ 1642876 ] Open manual for command line help
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/Brazilian/MergeBrazilian.rc
trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
trunk/Src/Languages/Catalan/MergeCatalan.rc
trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
trunk/Src/Languages/Czech/MergeCzech.rc
trunk/Src/Languages/Danish/MergeDanish.rc
trunk/Src/Languages/Dutch/MergeDutch.rc
trunk/Src/Languages/French/MergeFrench.rc
trunk/Src/Languages/German/MergeGerman.rc
trunk/Src/Languages/Hungarian/MergeHungarian.rc
trunk/Src/Languages/Italian/MergeItalian.rc
trunk/Src/Languages/Japanese/MergeJapanese.rc
trunk/Src/Languages/Korean/MergeKorean.rc
trunk/Src/Languages/Norwegian/MergeNorwegian.rc
trunk/Src/Languages/Polish/MergePolish.rc
trunk/Src/Languages/Russian/MergeRussian.rc
trunk/Src/Languages/Slovak/MergeSlovak.rc
trunk/Src/Languages/Spanish/MergeSpanish.rc
trunk/Src/Languages/Swedish/MergeSwedish.rc
trunk/Src/Languages/Turkish/MergeTurkish.rc
trunk/Src/Merge.cpp
trunk/Src/Merge.h
trunk/Src/Merge.rc
trunk/Src/resource.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-19 16:12:26 UTC (rev 4114)
+++ trunk/Src/Changes.txt 2007-02-19 17:23:57 UTC (rev 4115)
@@ -7,6 +7,9 @@
Src: DirCompProgressDlg.cpp DirCompProgressDlg.h
Bug: [ 1663197 ] s/inproper/improper [in Changes.txt]
Src: Changes.txt
+ PATCH: [ 1642876 ] Open manual for command line help
+ Src: Merge.cpp Merge.h Merge.rc resource.h
+ Src/Languages/*: Merge*.rc
2007-02-17 Jan Hryz
Czech translation - update
Modified: trunk/Src/Languages/Brazilian/MergeBrazilian.rc
===================================================================
--- trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2007-02-19 16:12:26 UTC (rev 4114)
+++ trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2007-02-19 17:23:57 UTC (rev 4115)
@@ -1966,32 +1966,6 @@
IDS_UNICODE "Unicode"
END
-// WINMERGE COMMAND LINE HELP#1
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]"
- IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]"
- IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name"
- IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc"
- IDS_CMDLINE_SYNTAX_RIGHTDESC "rightdesc"
- IDS_CMDLINE_WHERE "where:"
- IDS_CMDLINE_HELP "/? or -? displays this help"
- IDS_CMDLINE_RECURSIVE "/r or -r tells winmerge to compare directories recursively"
- IDS_CMDLINE_ESCKEY "/e or -e allows WinMerge to be closed with a single esc keypress"
-END
-
-// WINMERGE COMMAND LINE HELP#2
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_FILEMASK "/f or -f sets filemask or filtername for compare"
- 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 "leftpath is the directory or filename to open on the left side"
- IDS_CMDLINE_RIGHTPATH "rightpath is the directory or filename to open on the right side"
- IDS_CMDLINE_OUTPUTPATH "outputpath is an optional output directory where you want merged files to be saved"
- IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference."
-END
-
// VARIOUS OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-02-19 16:12:26 UTC (rev 4114)
+++ trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-02-19 17:23:57 UTC (rev 4115)
@@ -1983,32 +1983,6 @@
IDS_UNICODE "\xD3\xED\xE8\xEA\xEE\xE4"
END
-// WINMERGE COMMAND LINE HELP#1
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]"
- IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]"
- IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name"
- IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc"
- IDS_CMDLINE_SYNTAX_RIGHTDESC "rightdesc"
- IDS_CMDLINE_WHERE "where:"
- IDS_CMDLINE_HELP "/? or -? displays this help"
- IDS_CMDLINE_RECURSIVE "/r or -r tells winmerge to compare directories recursively"
- IDS_CMDLINE_ESCKEY "/e or -e allows WinMerge to be closed with a single esc keypress"
-END
-
-// WINMERGE COMMAND LINE HELP#2
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_FILEMASK "/f or -f sets filemask or filtername for compare"
- 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 "leftpath is the directory or filename to open on the left side"
- IDS_CMDLINE_RIGHTPATH "rightpath is the directory or filename to open on the right side"
- IDS_CMDLINE_OUTPUTPATH "outputpath is an optional output directory where you want merged files to be saved"
- IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference."
-END
-
// VARIOUS OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-02-19 16:12:26 UTC (rev 4114)
+++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-02-19 17:23:57 UTC (rev 4115)
@@ -1984,32 +1984,6 @@
IDS_UNICODE "Unicode"
END
-// WINMERGE COMMAND LINE HELP#1
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_SYNTAX "Sintaxi : WinMerge [/r] [/e] [/x] [/s]"
- IDS_CMDLINE_SYNTAX_ARGS "camiesq camidreta [camisortida]"
- IDS_CMDLINE_SYNTAX_ARG_FILTER "m\xE0scara/nom"
- IDS_CMDLINE_SYNTAX_LEFTDESC "descesq"
- IDS_CMDLINE_SYNTAX_RIGHTDESC "descdreta"
- IDS_CMDLINE_WHERE "on:"
- IDS_CMDLINE_HELP "/? o -? mostra aquesta ajuda"
- IDS_CMDLINE_RECURSIVE "/r o -r diu al WinMerge que compari directoris recursivament"
- IDS_CMDLINE_ESCKEY "/e o -e permet tancar el WinMerge amb una \xFAnica polsaci\xF3 d'Esc"
-END
-
-// WINMERGE COMMAND LINE HELP#2
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_FILEMASK "/f o -f especifica la m\xE0scara de fitxers o el nom del filtre per a comparar"
- IDS_CMDLINE_FASTCLOSE "/x or -x tanca el WinMerge si el resultat \xE9s id\xE8ntic"
- IDS_CMDLINE_SINGLE_INST "/s or -s obre els camins a una inst\xE0ncia existent del WinMerge"
- IDS_CMDLINE_LEFTPATH "camiesq \xE9s el directori o nom de fitxer per a \xE9sser obert a la banda esquerra"
- IDS_CMDLINE_RIGHTPATH "camidreta \xE9s el directori o nom de fitxer per a \xE9sser obert a la banda dreta"
- IDS_CMDLINE_OUTPUTPATH "camisortida \xE9s un directori de sortida opcional on voleu que siguin desats els fitxers fusionats"
- IDS_CMDLINE_SEEMANUAL "Veieu el manual per a una refer\xE8ncia completa de la l\xEDnia de comandes."
-END
-
// VARIOUS OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
===================================================================
--- trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-02-19 16:12:26 UTC (rev 4114)
+++ trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-02-19 17:23:57 UTC (rev 4115)
@@ -1967,32 +1967,6 @@
IDS_UNICODE "Unicode"
END
-// WINMERGE COMMAND LINE HELP#1
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]"
- IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]"
- IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name"
- IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc"
- IDS_CMDLINE_SYNTAX_RIGHTDESC "rightdesc"
- IDS_CMDLINE_WHERE "where:"
- IDS_CMDLINE_HELP "/? or -? displays this help"
- IDS_CMDLINE_RECURSIVE "/r or -r tells winmerge to compare directories recursively"
- IDS_CMDLINE_ESCKEY "/e or -e allows WinMerge to be closed with a single esc keypress"
-END
-
-// WINMERGE COMMAND LINE HELP#2
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_FILEMASK "/f or -f sets filemask or filtername for compare"
- 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 "leftpath is the directory or filename to open on the left side"
- IDS_CMDLINE_RIGHTPATH "rightpath is the directory or filename to open on the right side"
- IDS_CMDLINE_OUTPUTPATH "outputpath is an optional output directory where you want merged files to be saved"
- IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference."
-END
-
// VARIOUS OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
===================================================================
--- trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2007-02-19 16:12:26 UTC (rev 4114)
+++ trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2007-02-19 17:23:57 UTC (rev 4115)
@@ -1966,32 +1966,6 @@
IDS_UNICODE "Unicode"
END
-// WINMERGE COMMAND LINE HELP#1
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]"
- IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]"
- IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name"
- IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc"
- IDS_CMDLINE_SYNTAX_RIGHTDESC "rightdesc"
- IDS_CMDLINE_WHERE "where:"
- IDS_CMDLINE_HELP "/? or -? displays this help"
- IDS_CMDLINE_RECURSIVE "/r or -r tells winmerge to compare directories recursively"
- IDS_CMDLINE_ESCKEY "/e or -e allows WinMerge to be closed with a single esc keypress"
-END
-
-// WINMERGE COMMAND LINE HELP#2
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_FILEMASK "/f or -f sets filemask or filtername for compare"
- 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 "leftpath is the directory or filename to open on the left side"
- IDS_CMDLINE_RIGHTPATH "rightpath is the directory or filename to open on the right side"
- IDS_CMDLINE_OUTPUTPATH "outputpath is an optional output directory where you want merged files to be saved"
- IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference."
-END
-
// VARIOUS OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Czech/MergeCzech.rc
===================================================================
--- trunk/Src/Languages/Czech/MergeCzech.rc 2007-02-19 16:12:26 UTC (rev 4114)
+++ trunk/Src/Languages/Czech/MergeCzech.rc 2007-02-19 17:23:57 UTC (rev 4115)
@@ -1965,32 +1965,6 @@
IDS_UNICODE "Unicode"
END
-// WINMERGE COMMAND LINE HELP#1
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]"
- IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]"
- IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name"
- IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc"
- IDS_CMDLINE_SYNTAX_RIGHTDESC "rightdesc"
- IDS_CMDLINE_WHERE "where:"
- IDS_CMDLINE_HELP "/? or -? displays this help"
- IDS_CMDLINE_RECURSIVE "/r or -r tells winmerge to compare directories recursively"
- IDS_CMDLINE_ESCKEY "/e or -e allows WinMerge to be closed with a single esc keypress"
-END
-
-// WINMERGE COMMAND LINE HELP#2
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_FILEMASK "/f or -f sets filemask or filtername for compare"
- 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 "leftpath is the directory or filename to open on the left side"
- IDS_CMDLINE_RIGHTPATH "rightpath is the directory or filename to open on the right side"
- IDS_CMDLINE_OUTPUTPATH "outputpath is an optional output directory where you want merged files to be saved"
- IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference."
-END
-
// VARIOUS OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Danish/MergeDanish.rc
===================================================================
--- trunk/Src/Languages/Danish/MergeDanish.rc 2007-02-19 16:12:26 UTC (rev 4114)
+++ trunk/Src/Languages/Danish/MergeDanish.rc 2007-02-19 17:23:57 UTC (rev 4115)
@@ -1966,32 +1966,6 @@
IDS_UNICODE "Unicode"
END
-// WINMERGE COMMAND LINE HELP#1
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]"
- IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]"
- IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name"
- IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc"
- IDS_CMDLINE_SYNTAX_RIGHTDESC "rightdesc"
- IDS_CMDLINE_WHERE "where:"
- IDS_CMDLINE_HELP "/? or -? displays this help"
- IDS_CMDLINE_RECURSIVE "/r or -r tells winmerge to compare directories recursively"
- IDS_CMDLINE_ESCKEY "/e or -e allows WinMerge to be closed with a single esc keypress"
-END
-
-// WINMERGE COMMAND LINE HELP#2
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_FILEMASK "/f or -f sets filemask or filtername for compare"
- 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 "leftpath is the directory or filename to open on the left side"
- IDS_CMDLINE_RIGHTPATH "rightpath is the directory or filename to open on the right side"
- IDS_CMDLINE_OUTPUTPATH "outputpath is an optional output directory where you want merged files to be saved"
- IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference."
-END
-
// VARIOUS OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Dutch/MergeDutch.rc
===================================================================
--- trunk/Src/Languages/Dutch/MergeDutch.rc 2007-02-19 16:12:26 UTC (rev 4114)
+++ trunk/Src/Languages/Dutch/MergeDutch.rc 2007-02-19 17:23:57 UTC (rev 4115)
@@ -1966,32 +1966,6 @@
IDS_UNICODE "Unicode"
END
-// WINMERGE COMMAND LINE HELP#1
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]"
- IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]"
- IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name"
- IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc"
- IDS_CMDLINE_SYNTAX_RIGHTDESC "rightdesc"
- IDS_CMDLINE_WHERE "where:"
- IDS_CMDLINE_HELP "/? or -? displays this help"
- IDS_CMDLINE_RECURSIVE "/r or -r tells winmerge to compare directories recursively"
- IDS_CMDLINE_ESCKEY "/e or -e allows WinMerge to be closed with a single esc keypress"
-END
-
-// WINMERGE COMMAND LINE HELP#2
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_FILEMASK "/f or -f sets filemask or filtername for compare"
- 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 "leftpath is the directory or filename to open on the left side"
- IDS_CMDLINE_RIGHTPATH "rightpath is the directory or filename to open on the right side"
- IDS_CMDLINE_OUTPUTPATH "outputpath is an optional output directory where you want merged files to be saved"
- IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference."
-END
-
// VARIOUS OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/French/MergeFrench.rc
===================================================================
--- trunk/Src/Languages/French/MergeFrench.rc 2007-02-19 16:12:26 UTC (rev 4114)
+++ trunk/Src/Languages/French/MergeFrench.rc 2007-02-19 17:23:57 UTC (rev 4115)
@@ -1959,32 +1959,6 @@
IDS_UNICODE "Unicode"
END
-// WINMERGE COMMAND LINE HELP#1
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]"
- IDS_CMDLINE_SYNTAX_ARGS "CheminGauche CheminDroit [CheminSortie]"
- IDS_CMDLINE_SYNTAX_ARG_FILTER "masque/filtre"
- IDS_CMDLINE_SYNTAX_LEFTDESC "description"
- IDS_CMDLINE_SYNTAX_RIGHTDESC "description"
- IDS_CMDLINE_WHERE "o\xF9:"
- IDS_CMDLINE_HELP "/? or -? affiche cet aide"
- IDS_CMDLINE_RECURSIVE "/r or -r indique de comparer recursivement les r\xE9pertoires"
- IDS_CMDLINE_ESCKEY "/e or -e permet la fermeture avec la touche esc"
-END
-
-// 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."
-END
-
// VARIOUS OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/German/MergeGerman.rc
===================================================================
--- trunk/Src/Languages/German/MergeGerman.rc 2007-02-19 16:12:26 UTC (rev 4114)
+++ trunk/Src/Languages/German/MergeGerman.rc 2007-02-19 17:23:57 UTC (rev 4115)
@@ -1966,32 +1966,6 @@
IDS_UNICODE "Unicode"
END
-// WINMERGE COMMAND LINE HELP#1
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]"
- IDS_CMDLINE_SYNTAX_ARGS "LinkerPfad RechterPfad [AusgabePfad]"
- IDS_CMDLINE_SYNTAX_ARG_FILTER "Maske/Name"
- IDS_CMDLINE_SYNTAX_LEFTDESC "LinkeBeschreibung"
- IDS_CMDLINE_SYNTAX_RIGHTDESC "RechteBeschreibung"
- IDS_CMDLINE_WHERE "Wo:"
- IDS_CMDLINE_HELP "/? oder -? zeigt diese Hilfe"
- IDS_CMDLINE_RECURSIVE "/r oder -r befiehlt WinMerge, Verzeichnisse rekursiv zu vergleichen"
- IDS_CMDLINE_ESCKEY "/e oder -e erlaubt, dass WinMerge mit einem einzelnen ESC-Tastendruck geschlossen wird"
-END
-
-// WINMERGE COMMAND LINE HELP#2
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_FILEMASK "/f oder -f setzt die Dateimaske oder den Filtername f\xFCr den Vergleich"
- IDS_CMDLINE_FASTCLOSE "/x oder -x schlie\xDFt WinMerge, wenn das Ergebnis identisch ist"
- IDS_CMDLINE_SINGLE_INST "/s oder -s \xF6ffnet Pfade zur bestehenden WinMerge-Instanz"
- IDS_CMDLINE_LEFTPATH "LinkerPfad ist das Verzeichnis oder der Dateiname zum \xD6ffnen auf der linken Seite"
- IDS_CMDLINE_RIGHTPATH "RechterPfad ist das Verzeichnis oder der Dateiname zum \xD6ffnen auf der rechten Seite"
- IDS_CMDLINE_OUTPUTPATH "AusgabePfad ist ein optionales Ausgabeverzeichnis, in dem Sie die vermischten Dateien speichern m\xF6chten"
- IDS_CMDLINE_SEEMANUAL "Sehen Sie ins Handbuch f\xFCr eine komplette Befehlszeilen-Referenz."
-END
-
// VARIOUS OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Hungarian/MergeHungarian.rc
===================================================================
--- trunk/Src/Languages/Hungarian/MergeHungarian.rc 2007-02-19 16:12:26 UTC (rev 4114)
+++ trunk/Src/Languages/Hungarian/MergeHungarian.rc 2007-02-19 17:23:57 UTC (rev 4115)
@@ -1964,32 +1964,6 @@
IDS_UNICODE "Unicode"
END
-// WINMERGE COMMAND LINE HELP#1
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]"
- IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]"
- IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name"
- IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc"
- IDS_CMDLINE_SYNTAX_RIGHTDESC "rightdesc"
- IDS_CMDLINE_WHERE "where:"
- IDS_CMDLINE_HELP "/? or -? displays this help"
- IDS_CMDLINE_RECURSIVE "/r or -r tells winmerge to compare directories recursively"
- IDS_CMDLINE_ESCKEY "/e or -e allows WinMerge to be closed with a single esc keypress"
-END
-
-// WINMERGE COMMAND LINE HELP#2
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_FILEMASK "/f or -f sets filemask or filtername for compare"
- 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 "leftpath is the directory or filename to open on the left side"
- IDS_CMDLINE_RIGHTPATH "rightpath is the directory or filename to open on the right side"
- IDS_CMDLINE_OUTPUTPATH "outputpath is an optional output directory where you want merged files to be saved"
- IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference."
-END
-
// VARIOUS OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Italian/MergeItalian.rc
===================================================================
--- trunk/Src/Languages/Italian/MergeItalian.rc 2007-02-19 16:12:26 UTC (rev 4114)
+++ trunk/Src/Languages/Italian/MergeItalian.rc 2007-02-19 17:23:57 UTC (rev 4115)
@@ -1965,32 +1965,6 @@
IDS_UNICODE "Unicode"
END
-// WINMERGE COMMAND LINE HELP#1
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_SYNTAX "Sintassi : WinMerge [/r] [/e] [/x] [/s]"
- IDS_CMDLINE_SYNTAX_ARGS "percsx percdx [percoutput]"
- IDS_CMDLINE_SYNTAX_ARG_FILTER "maschera/nome"
- IDS_CMDLINE_SYNTAX_LEFTDESC "descsx"
- IDS_CMDLINE_SYNTAX_RIGHTDESC "descdx"
- IDS_CMDLINE_WHERE "dove:"
- IDS_CMDLINE_HELP "/? o -? visualizza questo aiuto"
- IDS_CMDLINE_RECURSIVE "/r o -r indica a winmerge di confrontare le cartelle ricorsivamente"
- IDS_CMDLINE_ESCKEY "/e o -e permette la chiusura di WinMerge con la semplice pressione di Esc"
-END
-
-// WINMERGE COMMAND LINE HELP#2
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_FILEMASK "/f o -f imposta la maschera di file o il nome del filtro per il confronto"
- IDS_CMDLINE_FASTCLOSE "/x o -x chiude WinMerge se gli elementi confrontati sono identici"
- IDS_CMDLINE_SINGLE_INST "/s o -s apre i percorsi nell'istanza corrente di WinMerge"
- IDS_CMDLINE_LEFTPATH "percsx \xE8 la cartella o il nome del file da aprire sul lato sinistro"
- IDS_CMDLINE_RIGHTPATH "percdx \xE8 la cartella o il nome del file da aprire sul lato destro"
- IDS_CMDLINE_OUTPUTPATH "percoutput \xE8 una cartella di output opzionale in cui desideri siano salvati i file riuniti"
- IDS_CMDLINE_SEEMANUAL "Guarda il manuale per una guida completa sulla linea di comando."
-END
-
// VARIOUS OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Japanese/MergeJapanese.rc
===================================================================
--- trunk/Src/Languages/Japanese/MergeJapanese.rc 2007-02-19 16:12:26 UTC (rev 4114)
+++ trunk/Src/Languages/Japanese/MergeJapanese.rc 2007-02-19 17:23:57 UTC (rev 4115)
@@ -1966,32 +1966,6 @@
IDS_UNICODE "Unicode"
END
-// WINMERGE COMMAND LINE HELP#1
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]"
- IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]"
- IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name"
- IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc"
- IDS_CMDLINE_SYNTAX_RIGHTDESC "rightdesc"
- IDS_CMDLINE_WHERE "where:"
- IDS_CMDLINE_HELP "/? or -? \x82\xB1\x82̃w\x83\x8B\x83v\x82\xF0\x95\\x8E\xA6\x82\xB5\x82܂\xB7"
- IDS_CMDLINE_RECURSIVE "/r or -r \x8DċA\x93I\x82Ƀt\x83H\x83\x8B\x83_\x82\xF0\x94\xE4\x8Ar\x82\xB5\x82܂\xB7"
- IDS_CMDLINE_ESCKEY "/e or -e Esc\x83L\x81[\x82̉\x9F\x89\xBA\x82\xC5WinMerge\x82\xF0\x8FI\x97\xB9\x82\xB5\x82܂\xB7"
-END
-
-// WINMERGE COMMAND LINE HELP#2
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_FILEMASK "/f or -f \x83t\x83@\x83C\x83\x8B\x83}\x83X\x83N\x82܂\xBD\x82̓t\x83B\x83\x8B\x83^\x96\xBC\x82\xF0\x90ݒ肵\x82܂\xB7"
- IDS_CMDLINE_FASTCLOSE "/x or -x \x82\xE0\x82\xB5\x94\xE4\x8Ar\x8C\x8B\x89ʂ\xAA\x93\xAF\x88\xEA\x82ł\xA0\x82\xE9\x82Ȃ\xE7\x82\xCE WinMerge\x82\xF0\x95\xB6\x82܂\xB7"
- IDS_CMDLINE_SINGLE_INST "/s or -s \x8E\xC0\x8Ds\x92\x86\x82\xCCWinMerge\x82Ŏw\x92肵\x82\xBD\x83p\x83X\x82\xF0\x8AJ\x82\xAB\x82܂\xB7"
- IDS_CMDLINE_LEFTPATH "leftpath \x82́A\x8D\xB6\x91\xA4\x82ŊJ\x82\xAD\x83t\x83H\x83\x8B\x83_\x82܂\xBD\x82̓t\x83@\x83C\x83\x8B\x96\xBC\x82ł\xB7"
- IDS_CMDLINE_RIGHTPATH "rightpath \x82́A\x89E\x91\xA4\x82ŊJ\x82\xAD\x83t\x83H\x83\x8B\x83_\x82܂\xBD\x82̓t\x83@\x83C\x83\x8B\x96\xBC\x82ł\xB7"
- IDS_CMDLINE_OUTPUTPATH "outputpath \x82́A\x8Fȗ\xAA\x89\\x82ȃ}\x81[\x83W\x82\xB3\x82ꂽ\x83t\x83@\x83C\x83\x8B\x82̕ۑ\xB6\x90\xE6\x83t\x83H\x83\x8B\x83_\x82ł\xB7"
- IDS_CMDLINE_SEEMANUAL "\x8F\xE3\x8BL\x82\xAA\x91S\x82Ăł͂\xA0\x82\xE8\x82܂\xB9\x82\xF1\x81B\x8A\xAE\x91S\x82ȃR\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x8F\x91\x8E\xAE\x82ɂ\xA2\x82Ă̓}\x83j\x83\x85\x83A\x83\x8B\x82\xF0\x8EQ\x8FƂ\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2"
-END
-
// VARIOUS OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Korean/MergeKorean.rc
===================================================================
--- trunk/Src/Languages/Korean/MergeKorean.rc 2007-02-19 16:12:26 UTC (rev 4114)
+++ trunk/Src/Languages/Korean/MergeKorean.rc 2007-02-19 17:23:57 UTC (rev 4115)
@@ -1966,32 +1966,6 @@
IDS_UNICODE "Unicode"
END
-// WINMERGE COMMAND LINE HELP#1
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]"
- IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]"
- IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name"
- IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc"
- IDS_CMDLINE_SYNTAX_RIGHTDESC "rightdesc"
- IDS_CMDLINE_WHERE "where:"
- IDS_CMDLINE_HELP "/? or -? displays this help"
- IDS_CMDLINE_RECURSIVE "/r or -r tells winmerge to compare directories recursively"
- IDS_CMDLINE_ESCKEY "/e or -e allows WinMerge to be closed with a single esc keypress"
-END
-
-// WINMERGE COMMAND LINE HELP#2
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_FILEMASK "/f or -f sets filemask or filtername for compare"
- 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 "leftpath is the directory or filename to open on the left side"
- IDS_CMDLINE_RIGHTPATH "rightpath is the directory or filename to open on the right side"
- IDS_CMDLINE_OUTPUTPATH "outputpath is an optional output directory where you want merged files to be saved"
- IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference."
-END
-
// VARIOUS OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Norwegian/MergeNorwegian.rc
===================================================================
--- trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2007-02-19 16:12:26 UTC (rev 4114)
+++ trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2007-02-19 17:23:57 UTC (rev 4115)
@@ -1966,32 +1966,6 @@
IDS_UNICODE "Unicode"
END
-// WINMERGE COMMAND LINE HELP#1
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]"
- IDS_CMDLINE_SYNTAX_ARGS "vsti hsti [utsti]"
- IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name"
- IDS_CMDLINE_SYNTAX_LEFTDESC "vbeskr"
- IDS_CMDLINE_SYNTAX_RIGHTDESC "hbeskr"
- IDS_CMDLINE_WHERE "hvor:"
- IDS_CMDLINE_HELP "/? eller -? viser denne hjelpen"
- IDS_CMDLINE_RECURSIVE "/r eller -r ber WinMerge om \xE5 sammenligne mapper rekursivt"
- IDS_CMDLINE_ESCKEY "/e eller -e tillater lukking WinMerge ved kun \xE5 trykke ESC"
-END
-
-// WINMERGE COMMAND LINE HELP#2
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_FILEMASK "/f eller -f sett filmaske eller filternavn for sammenligning"
- 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 "vsti er mappen eller filen som skal \xE5pnes p\xE5 venstre side"
- IDS_CMDLINE_RIGHTPATH "hsti er mappen eller filen som skal \xE5pnes p\xE5 h\xF8yre side"
- IDS_CMDLINE_OUTPUTPATH "utsti er en valgfri mappe hvor flettede filer blir lagret"
- IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference."
-END
-
// VARIOUS OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Polish/MergePolish.rc
===================================================================
--- trunk/Src/Languages/Polish/MergePolish.rc 2007-02-19 16:12:26 UTC (rev 4114)
+++ trunk/Src/Languages/Polish/MergePolish.rc 2007-02-19 17:23:57 UTC (rev 4115)
@@ -1965,32 +1965,6 @@
IDS_UNICODE "Unicode"
END
-// WINMERGE COMMAND LINE HELP#1
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]"
- IDS_CMDLINE_SYNTAX_ARGS "lewa\x9Ccie\xBFka prawa\x9Ccie\xBFka[\x9Ccie\xBFkawyj\x9Cciowa]"
- IDS_CMDLINE_SYNTAX_ARG_FILTER "maska/nazwa"
- IDS_CMDLINE_SYNTAX_LEFTDESC "lewypanel"
- IDS_CMDLINE_SYNTAX_RIGHTDESC "prawypanel"
- IDS_CMDLINE_WHERE "gdzie:"
- IDS_CMDLINE_HELP "/? lub -? wy\x9Cwietla pomoc"
- IDS_CMDLINE_RECURSIVE "/r lub -r wskazuje winmerge, by por\xF3wnywa\xE6 katalogi rekursywnie"
- IDS_CMDLINE_ESCKEY "/e lub -e pozwala zamkn\xB9\xE6 WinMerge przez naci\x9Cni\xEAcie esc"
-END
-
-// WINMERGE COMMAND LINE HELP#2
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_FILEMASK "/f lub -f ustawia mask\xEA pliku lub nazw\xEA filtra dla por\xF3wnania"
- 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 "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 "Pe\xB3ny opis linii komend w podr\xEAczniku."
-END
-
// VARIOUS OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- trunk/Src/Languages/Russian/MergeRussian.rc 2007-02-19 16:12:26 UTC (rev 4114)
+++ trunk/Src/Languages/Russian/MergeRussian.rc 2007-02-19 17:23:57 UTC (rev 4115)
@@ -1966,32 +1966,6 @@
IDS_UNICODE "Unicode"
END
-// WINMERGE COMMAND LINE HELP#1
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]"
- IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]"
- IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name"
- IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc"
- IDS_CMDLINE_SYNTAX_RIGHTDESC "rightdesc"
- IDS_CMDLINE_WHERE "where:"
- IDS_CMDLINE_HELP "/? or -? displays this help"
- IDS_CMDLINE_RECURSIVE "/r or -r tells winmerge to compare directories recursively"
- IDS_CMDLINE_ESCKEY "/e or -e allows WinMerge to be closed with a single esc keypress"
-END
-
-// WINMERGE COMMAND LINE HELP#2
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_FILEMASK "/f or -f sets filemask or filtername for compare"
- 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 "leftpath is the directory or filename to open on the left side"
- IDS_CMDLINE_RIGHTPATH "rightpath is the directory or filename to open on the right side"
- IDS_CMDLINE_OUTPUTPATH "outputpath is an optional output directory where you want merged files to be saved"
- IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference."
-END
-
// VARIOUS OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Slovak/MergeSlovak.rc
===================================================================
--- trunk/Src/Languages/Slovak/MergeSlovak.rc 2007-02-19 16:12:26 UTC (rev 4114)
+++ trunk/Src/Languages/Slovak/MergeSlovak.rc 2007-02-19 17:23:57 UTC (rev 4115)
@@ -1965,32 +1965,6 @@
IDS_UNICODE "Unicode"
END
-// WINMERGE COMMAND LINE HELP#1
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]"
- IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]"
- IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name"
- IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc"
- IDS_CMDLINE_SYNTAX_RIGHTDESC "rightdesc"
- IDS_CMDLINE_WHERE "where:"
- IDS_CMDLINE_HELP "/? or -? zobraz\xED tohto pomocn\xEDka"
- IDS_CMDLINE_RECURSIVE "/r or -r porovn\xE1va\x9D adres\xE1re rekurz\xEDvne"
- IDS_CMDLINE_ESCKEY "/e or -e umo\x9E\xF2uje zatvori\x9D WinMerge stla\xE8en\xEDm ESC"
-END
-
-// WINMERGE COMMAND LINE HELP#2
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_FILEMASK "/f or -f nastavuje masku s\xFAboru alebo filter pre porovnanie"
- IDS_CMDLINE_FASTCLOSE "/x or -x zatvor\xED WinMerge ak je v\xFDsledkom zhoda"
- IDS_CMDLINE_SINGLE_INST "/s or -s otvor\xED cesty k existuj\xFAcej in\x9Atancii WinMerge"
- IDS_CMDLINE_LEFTPATH "leftpath je adres\xE1r \xE8i n\xE1zov s\xFAboru na \xBEavej strane"
- IDS_CMDLINE_RIGHTPATH "rightpath je adres\xE1r \xE8i n\xE1zov s\xFAboru na pravej strane"
- IDS_CMDLINE_OUTPUTPATH "outputpath je nepovinn\xFD adres\xE1r, kde chcete ulo\x9Ei\x9D zl\xFA\xE8en\xE9 s\xFAbory"
- IDS_CMDLINE_SEEMANUAL "Pozri \xFApln\xFD zoznam parametrov pr\xEDkazov\xE9ho riadka v Pomocn\xEDkovi."
-END
-
// VARIOUS OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Spanish/MergeSpanish.rc
===================================================================
--- trunk/Src/Languages/Spanish/MergeSpanish.rc 2007-02-19 16:12:26 UTC (rev 4114)
+++ trunk/Src/Languages/Spanish/MergeSpanish.rc 2007-02-19 17:23:57 UTC (rev 4115)
@@ -1965,32 +1965,6 @@
IDS_UNICODE "Unicode"
END
-// WINMERGE COMMAND LINE HELP#1
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_SYNTAX "Sintaxis : WinMerge [/r] [/e] [/x] [/s]"
- IDS_CMDLINE_SYNTAX_ARGS "rutaizq rutadcha [rutasalida]"
- IDS_CMDLINE_SYNTAX_ARG_FILTER "mascara/nombre"
- IDS_CMDLINE_SYNTAX_LEFTDESC "descizq"
- IDS_CMDLINE_SYNTAX_RIGHTDESC "descdcha"
- IDS_CMDLINE_WHERE "donde:"
- IDS_CMDLINE_HELP "/? or -? muestra esta ayuda"
- IDS_CMDLINE_RECURSIVE "/r or -r compara los directorios de forma recursiva (incluir subdirectorios)"
- IDS_CMDLINE_ESCKEY "/e or -e permite que WinMergw se cierre con la tecla ESC"
-END
-
-// WINMERGE COMMAND LINE HELP#2
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_FILEMASK "/f or -f establece la mascara de ficheros o mascara de l\xEDneas para la comparaci\xF3n"
- IDS_CMDLINE_FASTCLOSE "/x o -x cierra WinMerge si el resultado es identico."
- IDS_CMDLINE_SINGLE_INST "/s o -s abre la comparaci\xF3n en una instancia de WinMerge existente."
- IDS_CMDLINE_LEFTPATH "rutaizq es el directorio o nombre de fichero a ser abierto en el lado izquierdo"
- IDS_CMDLINE_RIGHTPATH "rutadcha es el directorio o nombre de fichero a ser abierto en el lado derecho"
- IDS_CMDLINE_OUTPUTPATH "rutasalida es un directorio opcional donde se guardaran los ficheros combinados"
- IDS_CMDLINE_SEEMANUAL "Lea el manual para una referencia completa de la linea de comandos."
-END
-
// VARIOUS OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-02-19 16:12:26 UTC (rev 4114)
+++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-02-19 17:23:57 UTC (rev 4115)
@@ -1965,32 +1965,6 @@
IDS_UNICODE "Unicode"
END
-// WINMERGE COMMAND LINE HELP#1
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]"
- IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]"
- IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name"
- IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc"
- IDS_CMDLINE_SYNTAX_RIGHTDESC "rightdesc"
- IDS_CMDLINE_WHERE "d\xE4r:"
- IDS_CMDLINE_HELP "/? eller -? visar denna hj\xE4lp"
- IDS_CMDLINE_RECURSIVE "/r eller -r f\xE5r WinMerge att j\xE4mf\xF6ra kataloger rekursivt"
- IDS_CMDLINE_ESCKEY "/e eller -e l\xE5ter WinMerge st\xE4ngas med en enkel ESC-tryckning"
-END
-
-// WINMERGE COMMAND LINE HELP#2
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_FILEMASK "/f eller -f anger filmask eller filternamn f\xF6r j\xE4mf\xF6relse"
- IDS_CMDLINE_FASTCLOSE "/x eller -x avslutar WinMerge om resultatet \xE4r identiskt"
- IDS_CMDLINE_SINGLE_INST "/s eller -s \xF6ppnar s\xF6kv\xE4gar till existerande WinMerge version"
- IDS_CMDLINE_LEFTPATH "leftpath \xE4r katalogen eller filnamnet att \xF6ppna p\xE5 v\xE4nster sida"
- IDS_CMDLINE_RIGHTPATH "rightpath \xE4r katalogen eller filnamnet att \xF6ppna p\xE5 h\xF6ger sida"
- IDS_CMDLINE_OUTPUTPATH "outputpath \xE4r en optionell utdatakatalog d\xE4r du vill att \xE4ndrade filer ska sparas"
- IDS_CMDLINE_SEEMANUAL "Se manualen f\xF6r komplett kommandoradsreferens."
-END
-
// VARIOUS OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Languages/Turkish/MergeTurkish.rc
===================================================================
--- trunk/Src/Languages/Turkish/MergeTurkish.rc 2007-02-19 16:12:26 UTC (rev 4114)
+++ trunk/Src/Languages/Turkish/MergeTurkish.rc 2007-02-19 17:23:57 UTC (rev 4115)
@@ -1966,32 +1966,6 @@
IDS_UNICODE "Unicode"
END
-// WINMERGE COMMAND LINE HELP#1
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]"
- IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]"
- IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name"
- IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc"
- IDS_CMDLINE_SYNTAX_RIGHTDESC "rightdesc"
- IDS_CMDLINE_WHERE "where:"
- IDS_CMDLINE_HELP "/? or -? displays this help"
- IDS_CMDLINE_RECURSIVE "/r or -r tells winmerge to compare directories recursively"
- IDS_CMDLINE_ESCKEY "/e or -e allows WinMerge to be closed with a single esc keypress"
-END
-
-// WINMERGE COMMAND LINE HELP#2
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_FILEMASK "/f or -f sets filemask or filtername for compare"
- 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 "leftpath is the directory or filename to open on the left side"
- IDS_CMDLINE_RIGHTPATH "rightpath is the directory or filename to open on the right side"
- IDS_CMDLINE_OUTPUTPATH "outputpath is an optional output directory where you want merged files to be saved"
- IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference."
-END
-
// VARIOUS OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2007-02-19 16:12:26 UTC (rev 4114)
+++ trunk/Src/Merge.cpp 2007-02-19 17:23:57 UTC (rev 4115)
@@ -69,6 +69,9 @@
static const TCHAR DefaultRelativeFilterPath[] = _T("WinMerge\\Filters");
+/** @brief Location for command line help to open. */
+static TCHAR CommandLineHelpLocation[] = _T("::/htmlhelp/CommandLine.html");
+
/////////////////////////////////////////////////////////////////////////////
// CMergeApp
@@ -552,8 +555,7 @@
// comparison.
if (cmdInfo.m_bShowUsage)
{
- CString s = GetUsageDescription();
- AfxMessageBox(s, MB_ICONINFORMATION);
+ pMainFrame->ShowHelp(CommandLineHelpLocation);
}
else
{
@@ -732,28 +734,6 @@
return str;
}
-/** @brief Put together string of all cmdline arguments */
-CString CMergeApp::GetUsageDescription()
-{
- CString str;
- str += LoadResString(IDS_CMDLINE_SYNTAX);
- str += _T(" [/f ") + LoadResString(IDS_CMDLINE_SYNTAX_ARG_FILTER) + _T("]");
- str += _T(" ");
- str += LoadResString(IDS_CMDLINE_SYNTAX_ARGS);
- str += _T("\n\n") + LoadResString(IDS_CMDLINE_WHERE) + _T(" \n");
- str += CmdlineOption(IDS_CMDLINE_HELP);
- str += CmdlineOption(IDS_CMDLINE_RECURSIVE);
- str += CmdlineOption(IDS_CMDLINE_ESCKEY);
- str += CmdlineOption(IDS_CMDLINE_FILEMASK);
- str += CmdlineOption(IDS_CMDLINE_FASTCLOSE);
- str += CmdlineOption(IDS_CMDLINE_SINGLE_INST);
- str += CmdlineOption(IDS_CMDLINE_LEFTPATH);
- str += CmdlineOption(IDS_CMDLINE_RIGHTPATH);
- str += CmdlineOption(IDS_CMDLINE_OUTPUTPATH);
- str += _T("\n\n") + LoadResString(IDS_CMDLINE_SEEMANUAL);
- return str;
-}
-
/**
* @brief Get default editor path.
* @return full path to the editor program executable.
Modified: trunk/Src/Merge.h
===================================================================
--- trunk/Src/Merge.h 2007-02-19 16:12:26 UTC (rev 4114)
+++ trunk/Src/Merge.h 2007-02-19 17:23:57 UTC (rev 4115)
@@ -95,7 +95,6 @@
void InitializeFileFilters();
BOOL ParseArgsAndDoOpen(MergeCmdLineInfo& cmdInfo, CMainFrame* pMainFrame);
void SetOptionsFromCmdLine(const MergeCmdLineInfo& cmdInfo);
- CString GetUsageDescription();
// End MergeArgs.cpp
bool LoadAndOpenProjectFile(const CString & sFilepath);
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2007-02-19 16:12:26 UTC (rev 4114)
+++ trunk/Src/Merge.rc 2007-02-19 17:23:57 UTC (rev 4115)
@@ -1976,32 +1976,6 @@
IDS_UNICODE "Unicode"
END
-// WINMERGE COMMAND LINE HELP#1
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]"
- IDS_CMDLINE_SYNTAX_ARGS "leftpath rightpath [outputpath]"
- IDS_CMDLINE_SYNTAX_ARG_FILTER "mask/name"
- IDS_CMDLINE_SYNTAX_LEFTDESC "leftdesc"
- IDS_CMDLINE_SYNTAX_RIGHTDESC "rightdesc"
- IDS_CMDLINE_WHERE "where:"
- IDS_CMDLINE_HELP "/? or -? displays this help"
- IDS_CMDLINE_RECURSIVE "/r or -r tells winmerge to compare directories recursively"
- IDS_CMDLINE_ESCKEY "/e or -e allows WinMerge to be closed with a single esc keypress"
-END
-
-// WINMERGE COMMAND LINE HELP#2
-STRINGTABLE
-BEGIN
- IDS_CMDLINE_FILEMASK "/f or -f sets filemask or filtername for compare"
- 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 "leftpath is the directory or filename to open on the left side"
- IDS_CMDLINE_RIGHTPATH "rightpath is the directory or filename to open on the right side"
- IDS_CMDLINE_OUTPUTPATH "outputpath is an optional output directory where you want merged files to be saved"
- IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference."
-END
-
// VARIOUS OPTIONS
STRINGTABLE
BEGIN
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2007-02-19 16:12:26 UTC (rev 4114)
+++ trunk/Src/resource.h 2007-02-19 17:23:57 UTC (rev 4115)
@@ -484,23 +484,6 @@
#define IDS_FILEFILTER_OVERWRITE 16461
#define IDS_CC_CMD 16464
#define IDS_VSS_CMD 16465
-#define IDS_CMDLINE_SYNTAX 16510
-#define IDS_CMDLINE_SYNTAX_ARGS 16511
-#define IDS_CMDLINE_SYNTAX_ARG_FILTER 16512
-#define IDS_CMDLINE_SYNTAX_LEFTDESC 16513
-#define IDS_CMDLINE_SYNTAX_RIGHTDESC 16514
-#define IDS_CMDLINE_WHERE 16520
-#define IDS_CMDLINE_HELP 16530
-#define IDS_CMDLINE_RECURSIVE 16531
-#define IDS_CMDLINE_ESCKEY 16532
-#define IDS_CMDLINE_FILEMASK 16533
-#define IDS_CMDLINE_FASTCLOSE 16534
-#define IDS_CMDLINE_SINGLE_INST 16535
-#define IDS_CMDLINE_FORGETBOTH 16536
-#define IDS_CMDLINE_LEFTPATH 16541
-#define IDS_CMDLINE_RIGHTPATH 16542
-#define IDS_CMDLINE_OUTPUTPATH 16543
-#define IDS_CMDLINE_SEEMANUAL 16544
#define IDS_DIRECTORY_WINDOW_TITLE 16800
#define IDS_FILE_COMPARISON_TITLE 16801
#define IDS_EMPTY_LEFT_FILE 16802
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-02-20 16:23:01
|
Revision: 4118
http://svn.sourceforge.net/winmerge/?rev=4118&view=rev
Author: kimmov
Date: 2007-02-20 08:22:52 -0800 (Tue, 20 Feb 2007)
Log Message:
-----------
PATCH: [ 1663798 ] Add option and menuitem for file compare selection margin
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/Brazilian/MergeBrazilian.rc
trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
trunk/Src/Languages/Catalan/MergeCatalan.rc
trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
trunk/Src/Languages/Czech/MergeCzech.rc
trunk/Src/Languages/Danish/MergeDanish.rc
trunk/Src/Languages/Dutch/MergeDutch.rc
trunk/Src/Languages/French/MergeFrench.rc
trunk/Src/Languages/German/MergeGerman.rc
trunk/Src/Languages/Hungarian/MergeHungarian.rc
trunk/Src/Languages/Italian/MergeItalian.rc
trunk/Src/Languages/Japanese/MergeJapanese.rc
trunk/Src/Languages/Korean/MergeKorean.rc
trunk/Src/Languages/Norwegian/MergeNorwegian.rc
trunk/Src/Languages/Polish/MergePolish.rc
trunk/Src/Languages/Russian/MergeRussian.rc
trunk/Src/Languages/Slovak/MergeSlovak.rc
trunk/Src/Languages/Spanish/MergeSpanish.rc
trunk/Src/Languages/Swedish/MergeSwedish.rc
trunk/Src/Languages/Turkish/MergeTurkish.rc
trunk/Src/Merge.rc
trunk/Src/MergeEditView.cpp
trunk/Src/MergeEditView.h
trunk/Src/OptionsDef.h
trunk/Src/OptionsInit.cpp
trunk/Src/editlib/ccrystaltextview.cpp
trunk/Src/resource.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/Changes.txt 2007-02-20 16:22:52 UTC (rev 4118)
@@ -2,6 +2,13 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-02-20 Kimmo
+ PATCH: [ 1663798 ] Add option and menuitem for file compare selection margin
+ Src: Merge.rc MergeEditView.cpp MergeEditView.h OptionsDef.h OptionsInit.cpp
+ resource.h
+ Src/editlib: ccrystaltextview.cpp
+ Src/Languages/*: Merge*.rc
+
2007-02-19 Kimmo
PATCH: [ 1663012 ] Fix total count for compare progress dialog
Src: DirCompProgressDlg.cpp DirCompProgressDlg.h
Modified: trunk/Src/Languages/Brazilian/MergeBrazilian.rc
===================================================================
--- trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2007-02-20 16:22:52 UTC (rev 4118)
@@ -398,6 +398,7 @@
MENUITEM "E&xibir Espa\xE7os", ID_VIEW_WHITESPACE
MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS
MENUITEM "View Line &Numbers", ID_VIEW_LINENUMBERS
+ MENUITEM "View &Margins", ID_VIEW_FILEMARGIN
MENUITEM "W&rap Lines", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "Sw&ap Panes", ID_VIEW_SWAPPANES
@@ -2837,6 +2838,7 @@
ID_VIEW_SWAPPANES "Swap the positions of the two panes"
ID_VIEW_LINENUMBERS "Shows line numbers\nShow Line Numbers"
ID_VIEW_WORDWRAP "Enable word wrap\nWrap Lines"
+ ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins"
END
// MERGE MENU
Modified: trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-02-20 16:22:52 UTC (rev 4118)
@@ -398,6 +398,7 @@
MENUITEM "&\xCF\xEE\xEA\xE0\xE6\xE8 \xEF\xF0\xE0\xE7\xED\xE8\xF2\xE5 \xEC\xE5\xF1\xF2\xE0", ID_VIEW_WHITESPACE
MENUITEM "\xCF\xEE\xEA\xE0\xE6\xE8 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8\xF2\xE5 \xF0\xE5\xE4\xEE\xE2\xE5", ID_VIEW_LINEDIFFS
MENUITEM "\xCF\xEE\xEA\xE0\xE6\xE8 \xED\xEE\xEC\xE5\xF0\xE0 \xED\xE0 \xF0\xE5\xE4\xEE\xE2\xE5\xF2\xE5", ID_VIEW_LINENUMBERS
+ MENUITEM "View &Margins", ID_VIEW_FILEMARGIN
MENUITEM "\xCE\xF2\xF0\xE5\xE6\xE8 \xE4\xFA\xEB\xE3\xE8\xF2\xE5 \xF0\xE5\xE4\xEE\xE2\xE5", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "\xD0\xE0\xE7\xEC\xE5\xED\xE8 \xEB\xE8\xF1\xF2\xEE\xE2\xE5\xF2\xE5", ID_VIEW_SWAPPANES
@@ -2854,6 +2855,7 @@
ID_VIEW_SWAPPANES "\xD1\xEC\xE5\xED\xE8 \xEF\xEE\xE7\xE8\xF6\xE8\xE8\xF2\xE5 \xED\xE0 \xE4\xE2\xE0\xF2\xE0 \xEF\xE0\xED\xE5\xEB\xE0"
ID_VIEW_LINENUMBERS "\xCF\xEE\xEA\xE0\xE6\xE8 \xED\xEE\xEC\xE5\xF0\xE0 \xED\xE0 \xF0\xE5\xE4\xEE\xE2\xE5\xF2\xE5\n\xCF\xEE\xEA\xE0\xE6\xE8 \xED\xEE\xEC\xE5\xF0\xE0 \xED\xE0 \xF0\xE5\xE4\xEE\xE2\xE5\xF2\xE5"
ID_VIEW_WORDWRAP "\xCF\xEE\xE7\xE2\xEE\xEB\xE8 \xEF\xF0\xE5\xED\xE0\xF1\xFF\xED\xE5 \xED\xE0 \xE4\xF3\xEC\xE8\n\xCF\xF0\xE5\xED\xE0\xF1\xFF\xE9 \xF0\xE5\xE4\xEE\xE2\xE5\xF2\xE5"
+ ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins"
END
// MERGE MENU
Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2007-02-20 16:22:52 UTC (rev 4118)
@@ -398,6 +398,7 @@
MENUITEM "Mostra els es&pais", ID_VIEW_WHITESPACE
MENUITEM "Mostra les &difer\xE8ncies de la l\xEDnia", ID_VIEW_LINEDIFFS
MENUITEM "Mostra els &n\xFAmeros de l\xEDnia", ID_VIEW_LINENUMBERS
+ MENUITEM "View &Margins", ID_VIEW_FILEMARGIN
MENUITEM "A&justa les l\xEDnies", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "&Intercanvia les subfinestres", ID_VIEW_SWAPPANES
@@ -2855,6 +2856,7 @@
ID_VIEW_SWAPPANES "Intercanvia la posici\xF3 d'ambdues subfinestres"
ID_VIEW_LINENUMBERS "Mostra els n\xFAmeros de l\xEDnia\nMostra els n\xFAmeros de l\xEDnia"
ID_VIEW_WORDWRAP "Permet l'ajustament de paraules\nAjusta les l\xEDnies"
+ ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins"
END
// MERGE MENU
Modified: trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
===================================================================
--- trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-02-20 16:22:52 UTC (rev 4118)
@@ -400,6 +400,7 @@
MENUITEM "\xCF\xD4ʾ\xBFհ\xCD\xD6Ʊ\xED\xB7\xFB(&V)", ID_VIEW_WHITESPACE
MENUITEM "\xCF\xD4ʾ\xD0\xD0\xD6в\xBBͬ(&W)", ID_VIEW_LINEDIFFS
MENUITEM "View Line &Numbers", ID_VIEW_LINENUMBERS
+ MENUITEM "View &Margins", ID_VIEW_FILEMARGIN
MENUITEM "W&rap Lines", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "Sw&ap Panes", ID_VIEW_SWAPPANES
@@ -2831,6 +2832,7 @@
ID_VIEW_SWAPPANES "Swap the positions of the two panes"
ID_VIEW_LINENUMBERS "Shows line numbers\nShow Line Numbers"
ID_VIEW_WORDWRAP "Enable word wrap\nWrap Lines"
+ ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins"
END
// MERGE MENU
Modified: trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
===================================================================
--- trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2007-02-20 16:22:52 UTC (rev 4118)
@@ -398,6 +398,7 @@
MENUITEM "\xC0˵\xF8\xAAťթM\xB8\xF5\xAE\xE6(&V)", ID_VIEW_WHITESPACE
MENUITEM "\xC0˵\xF8\xA6C\xA4\xA3\xA6P(&W)", ID_VIEW_LINEDIFFS
MENUITEM "View Line &Numbers", ID_VIEW_LINENUMBERS
+ MENUITEM "View &Margins", ID_VIEW_FILEMARGIN
MENUITEM "W&rap Lines", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "Sw&ap Panes", ID_VIEW_SWAPPANES
@@ -2832,6 +2833,7 @@
ID_VIEW_SWAPPANES "Swap the positions of the two panes"
ID_VIEW_LINENUMBERS "Shows line numbers\nShow Line Numbers"
ID_VIEW_WORDWRAP "Enable word wrap\nWrap Lines"
+ ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins"
END
// MERGE MENU
Modified: trunk/Src/Languages/Czech/MergeCzech.rc
===================================================================
--- trunk/Src/Languages/Czech/MergeCzech.rc 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/Languages/Czech/MergeCzech.rc 2007-02-20 16:22:52 UTC (rev 4118)
@@ -398,6 +398,7 @@
MENUITEM "Zobrazit netisknuteln\xE9 &znaky", ID_VIEW_WHITESPACE
MENUITEM "Zobrazit rozd\xEDly v \xF8\xE1&dc\xEDch", ID_VIEW_LINEDIFFS
MENUITEM "Zobrazit \xE8\xEDsla \xF8\xE1d&k\xF9", ID_VIEW_LINENUMBERS
+ MENUITEM "View &Margins", ID_VIEW_FILEMARGIN
MENUITEM "Za&lamovat \xF8\xE1dky", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "Za&m\xECnit panely", ID_VIEW_SWAPPANES
@@ -2829,6 +2830,7 @@
ID_VIEW_SWAPPANES "Zam\xECn\xED um\xEDst\xECn\xED panel\xF9 s porovn\xE1n\xEDm soubor\xF9"
ID_VIEW_LINENUMBERS "Zobraz\xED nebo skryje \xE8\xEDsla \xF8\xE1dk\xF9\nZobrazit \xE8\xEDsla \xF8\xE1dk\xF9"
ID_VIEW_WORDWRAP "P\xF8ep\xEDn\xE1 zalamov\xE1n\xED \xF8\xE1dk\xF9\nZalamovat \xF8\xE1dky"
+ ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins"
END
// MERGE MENU
Modified: trunk/Src/Languages/Danish/MergeDanish.rc
===================================================================
--- trunk/Src/Languages/Danish/MergeDanish.rc 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/Languages/Danish/MergeDanish.rc 2007-02-20 16:22:52 UTC (rev 4118)
@@ -398,6 +398,7 @@
MENUITEM "Vis &mellemrum", ID_VIEW_WHITESPACE
MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS
MENUITEM "View Line &Numbers", ID_VIEW_LINENUMBERS
+ MENUITEM "View &Margins", ID_VIEW_FILEMARGIN
MENUITEM "W&rap Lines", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "Sw&ap Panes", ID_VIEW_SWAPPANES
@@ -2837,6 +2838,7 @@
ID_VIEW_SWAPPANES "Swap the positions of the two panes"
ID_VIEW_LINENUMBERS "Shows line numbers\nShow Line Numbers"
ID_VIEW_WORDWRAP "Enable word wrap\nWrap Lines"
+ ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins"
END
// MERGE MENU
Modified: trunk/Src/Languages/Dutch/MergeDutch.rc
===================================================================
--- trunk/Src/Languages/Dutch/MergeDutch.rc 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/Languages/Dutch/MergeDutch.rc 2007-02-20 16:22:52 UTC (rev 4118)
@@ -398,6 +398,7 @@
MENUITEM "Wit&ruimte tonen", ID_VIEW_WHITESPACE
MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS
MENUITEM "View Line &Numbers", ID_VIEW_LINENUMBERS
+ MENUITEM "View &Margins", ID_VIEW_FILEMARGIN
MENUITEM "W&rap Lines", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "Sw&ap Panes", ID_VIEW_SWAPPANES
@@ -2837,6 +2838,7 @@
ID_VIEW_SWAPPANES "Swap the positions of the two panes"
ID_VIEW_LINENUMBERS "Shows line numbers\nShow Line Numbers"
ID_VIEW_WORDWRAP "Enable word wrap\nWrap Lines"
+ ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins"
END
// MERGE MENU
Modified: trunk/Src/Languages/French/MergeFrench.rc
===================================================================
--- trunk/Src/Languages/French/MergeFrench.rc 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/Languages/French/MergeFrench.rc 2007-02-20 16:22:52 UTC (rev 4118)
@@ -396,6 +396,7 @@
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 "View &Margins", ID_VIEW_FILEMARGIN
MENUITEM "W&rap Lines", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "Sw&ap Panes", ID_VIEW_SWAPPANES
@@ -2828,8 +2829,9 @@
ID_VIEW_LANGUAGE "S\xE9lectionner le langage de l'interface\nLangage"
ID_VIEW_LINEDIFFS "Afficher les diff\xE9rences des lignes avec diff\xE9rentes couleurs\nAfficher diff\xE9rences des lignes"
ID_VIEW_SWAPPANES "Swap the positions of the two panes"
- ID_VIEW_LINENUMBERS^ "Shows line numbers\nShow Line Numbers"
+ ID_VIEW_LINENUMBERS "Shows line numbers\nShow Line Numbers"
ID_VIEW_WORDWRAP "Enable word wrap\nWrap Lines"
+ ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins"
END
// MERGE MENU
Modified: trunk/Src/Languages/German/MergeGerman.rc
===================================================================
--- trunk/Src/Languages/German/MergeGerman.rc 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/Languages/German/MergeGerman.rc 2007-02-20 16:22:52 UTC (rev 4118)
@@ -398,6 +398,7 @@
MENUITEM "Leer&zeichen anzeigen", ID_VIEW_WHITESPACE
MENUITEM "Zeilenuntersc&hied anzeigen", ID_VIEW_LINEDIFFS
MENUITEM "Zeilennu&mmern anzeigen", ID_VIEW_LINENUMBERS
+ MENUITEM "View &Margins", ID_VIEW_FILEMARGIN
MENUITEM "Zeilen &umbrechen", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "Ausschnitt v&ertauschen", ID_VIEW_SWAPPANES
@@ -2837,6 +2838,7 @@
ID_VIEW_SWAPPANES "Vertauscht die Position der beiden Ausschnitte."
ID_VIEW_LINENUMBERS "Zeigt Zeilennummern an.\nZeilennummern anzeigen"
ID_VIEW_WORDWRAP "Aktiviert das Umbrechen der Zeilen.\nZeilen umbrechen"
+ ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins"
END
// MERGE MENU
Modified: trunk/Src/Languages/Hungarian/MergeHungarian.rc
===================================================================
--- trunk/Src/Languages/Hungarian/MergeHungarian.rc 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/Languages/Hungarian/MergeHungarian.rc 2007-02-20 16:22:52 UTC (rev 4118)
@@ -398,6 +398,7 @@
MENUITEM "&Sz\xF3k\xF6z\xF6k mutat\xE1sa", ID_VIEW_WHITESPACE
MENUITEM "Sorok &elt\xE9r\xE9s\xE9nek mutat\xE1sa", ID_VIEW_LINEDIFFS
MENUITEM "View Line &Numbers", ID_VIEW_LINENUMBERS
+ MENUITEM "View &Margins", ID_VIEW_FILEMARGIN
MENUITEM "W&rap Lines", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "Sw&ap Panes", ID_VIEW_SWAPPANES
@@ -2835,6 +2836,7 @@
ID_VIEW_SWAPPANES "Swap the positions of the two panes"
ID_VIEW_LINENUMBERS "Shows line numbers\nShow Line Numbers"
ID_VIEW_WORDWRAP "Enable word wrap\nWrap Lines"
+ ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins"
END
// MERGE MENU
Modified: trunk/Src/Languages/Italian/MergeItalian.rc
===================================================================
--- trunk/Src/Languages/Italian/MergeItalian.rc 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/Languages/Italian/MergeItalian.rc 2007-02-20 16:22:52 UTC (rev 4118)
@@ -398,6 +398,7 @@
MENUITEM "&Visualizza spazi bianchi", ID_VIEW_WHITESPACE
MENUITEM "Visualizza &differenze nelle linee", ID_VIEW_LINEDIFFS
MENUITEM "Mostra i &numeri delle righe", ID_VIEW_LINENUMBERS
+ MENUITEM "View &Margins", ID_VIEW_FILEMARGIN
MENUITEM "A capo a&utomatico", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "Sc&ambia pannelli", ID_VIEW_SWAPPANES
@@ -2836,6 +2837,7 @@
ID_VIEW_SWAPPANES "Scambia le posizioni dei due pannelli"
ID_VIEW_LINENUMBERS "Mostra i numeri delle righe\nMostra numeri delle righe"
ID_VIEW_WORDWRAP "Vai a capo automaticamente\nVa a capo automaticamente (word wrap)"
+ ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins"
END
// MERGE MENU
Modified: trunk/Src/Languages/Japanese/MergeJapanese.rc
===================================================================
--- trunk/Src/Languages/Japanese/MergeJapanese.rc 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/Languages/Japanese/MergeJapanese.rc 2007-02-20 16:22:52 UTC (rev 4118)
@@ -398,6 +398,7 @@
MENUITEM "\x8B\xF0\x95\\x8E\xA6(&V)", ID_VIEW_WHITESPACE
MENUITEM "\x8Ds\x93\xE0\x82̍\xB7\x88ق\xF0\x95\\x8E\xA6(&W)", ID_VIEW_LINEDIFFS
MENUITEM "\x8Ds\x94ԍ\x86\x82\xF0\x95\\x8E\xA6(&N)", ID_VIEW_LINENUMBERS
+ MENUITEM "View &Margins", ID_VIEW_FILEMARGIN
MENUITEM "\x8Ds\x82\xF0\x89E\x92[\x82ŐܕԂ\xB7(&R)", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "\x83y\x83C\x83\x93\x82̌\xF0\x8A\xB7(&A)", ID_VIEW_SWAPPANES
@@ -2838,6 +2839,7 @@
ID_VIEW_SWAPPANES "2\x82̃y\x83C\x83\x93\x82̈ʒu\x82\xF0\x8C\xF0\x8A\xB7\x82\xB5\x82܂\xB7"
ID_VIEW_LINENUMBERS "\x8Ds\x94ԍ\x86\x82\xF0\x95\\x8E\xA6\x82\xB5\x82܂\xB7\n\x8Ds\x94ԍ\x86\x82\xF0\x95\\x8E\xA6"
ID_VIEW_WORDWRAP "\x8Ds\x82\xF0\x89E\x92[\x82Ő܂\xE8\x95Ԃ\xB5\x82܂\xB7\x81B\n\x8Ds\x82\xF0\x89E\x92[\x82ŐܕԂ\xB7"
+ ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins"
END
// MERGE MENU
Modified: trunk/Src/Languages/Korean/MergeKorean.rc
===================================================================
--- trunk/Src/Languages/Korean/MergeKorean.rc 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/Languages/Korean/MergeKorean.rc 2007-02-20 16:22:52 UTC (rev 4118)
@@ -398,6 +398,7 @@
MENUITEM "\xB0\xF8\xB9\xE9 \xBA\xB8\xB1\xE2(&V)", ID_VIEW_WHITESPACE
MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS
MENUITEM "View Line &Numbers", ID_VIEW_LINENUMBERS
+ MENUITEM "View &Margins", ID_VIEW_FILEMARGIN
MENUITEM "W&rap Lines", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "Sw&ap Panes", ID_VIEW_SWAPPANES
@@ -2835,6 +2836,7 @@
ID_VIEW_SWAPPANES "Swap the positions of the two panes"
ID_VIEW_LINENUMBERS "Shows line numbers\nShow Line Numbers"
ID_VIEW_WORDWRAP "Enable word wrap\nWrap Lines"
+ ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins"
END
// MERGE MENU
Modified: trunk/Src/Languages/Norwegian/MergeNorwegian.rc
===================================================================
--- trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2007-02-20 16:22:52 UTC (rev 4118)
@@ -398,6 +398,7 @@
MENUITEM "&Vis mellomrom", ID_VIEW_WHITESPACE
MENUITEM "V&is linjeforksjell", ID_VIEW_LINEDIFFS
MENUITEM "View Line &Numbers", ID_VIEW_LINENUMBERS
+ MENUITEM "View &Margins", ID_VIEW_FILEMARGIN
MENUITEM "W&rap Lines", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "Sw&ap Panes", ID_VIEW_SWAPPANES
@@ -2837,6 +2838,7 @@
ID_VIEW_SWAPPANES "Swap the positions of the two panes"
ID_VIEW_LINENUMBERS "Shows line numbers\nShow Line Numbers"
ID_VIEW_WORDWRAP "Enable word wrap\nWrap Lines"
+ ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins"
END
// MERGE MENU
Modified: trunk/Src/Languages/Polish/MergePolish.rc
===================================================================
--- trunk/Src/Languages/Polish/MergePolish.rc 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/Languages/Polish/MergePolish.rc 2007-02-20 16:22:52 UTC (rev 4118)
@@ -398,6 +398,7 @@
MENUITEM "&Poka\xBF bia\xB3e znaki", ID_VIEW_WHITESPACE
MENUITEM "Poka\xBF r\xF3\xBFnice &linii", ID_VIEW_LINEDIFFS
MENUITEM "Poka\xBF &numery linii", ID_VIEW_LINENUMBERS
+ MENUITEM "View &Margins", ID_VIEW_FILEMARGIN
MENUITEM "Za&wijaj linie", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "Za&mie\xF1 panele", ID_VIEW_SWAPPANES
@@ -2836,6 +2837,7 @@
ID_VIEW_SWAPPANES "Zamie\xF1 pozycje dw\xF3ch okien"
ID_VIEW_LINENUMBERS "Poka\xBF numery linii\nPoka\xBF numery linii"
ID_VIEW_WORDWRAP "W\xB3\xB9cz zawijanie s\xB3\xF3w\nZawijaj linie"
+ ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins"
END
// MERGE MENU
Modified: trunk/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- trunk/Src/Languages/Russian/MergeRussian.rc 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/Languages/Russian/MergeRussian.rc 2007-02-20 16:22:52 UTC (rev 4118)
@@ -398,6 +398,7 @@
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 "View &Margins", ID_VIEW_FILEMARGIN
MENUITEM "W&rap Lines", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "Sw&ap Panes", ID_VIEW_SWAPPANES
@@ -2830,6 +2831,7 @@
ID_VIEW_SWAPPANES "Swap the positions of the two panes"
ID_VIEW_LINENUMBERS "Shows line numbers\nShow Line Numbers"
ID_VIEW_WORDWRAP "Enable word wrap\nWrap Lines"
+ ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins"
END
// MERGE MENU
Modified: trunk/Src/Languages/Slovak/MergeSlovak.rc
===================================================================
--- trunk/Src/Languages/Slovak/MergeSlovak.rc 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/Languages/Slovak/MergeSlovak.rc 2007-02-20 16:22:52 UTC (rev 4118)
@@ -398,6 +398,7 @@
MENUITEM "&Zobraz pr\xE1zdne miesto", ID_VIEW_WHITESPACE
MENUITEM "Zobraz&i\x9D rozdiely riadkov", ID_VIEW_LINEDIFFS
MENUITEM "Zobrazi\x9D \xE8\xEDsla &riadkov", ID_VIEW_LINENUMBERS
+ MENUITEM "View &Margins", ID_VIEW_FILEMARGIN
MENUITEM "&Zalamova\x9D riadky", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "&Vymeni\x9D panely", ID_VIEW_SWAPPANES
@@ -2836,6 +2837,7 @@
ID_VIEW_SWAPPANES "Vymen\xED polohu dvoch panelov"
ID_VIEW_LINENUMBERS "Zobraz\xED \xE8\xEDsla riadkov\nZobrazi\x9D \xE8\xEDsla riadkov"
ID_VIEW_WORDWRAP "Zapne zalamovanie riadkov na hranici slov\nZalamova\x9D riadky"
+ ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins"
END
// MERGE MENU
Modified: trunk/Src/Languages/Spanish/MergeSpanish.rc
===================================================================
--- trunk/Src/Languages/Spanish/MergeSpanish.rc 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/Languages/Spanish/MergeSpanish.rc 2007-02-20 16:22:52 UTC (rev 4118)
@@ -398,6 +398,7 @@
MENUITEM "Mostrar &espacios", ID_VIEW_WHITESPACE
MENUITEM "Mostrar diferencias de &l\xEDnea", ID_VIEW_LINEDIFFS
MENUITEM "Ver &n\xFAmeros de l\xEDnea", ID_VIEW_LINENUMBERS
+ MENUITEM "View &Margins", ID_VIEW_FILEMARGIN
MENUITEM "&Ajuste de l\xEDnea", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "&Intercambiar paneles", ID_VIEW_SWAPPANES
@@ -2836,6 +2837,7 @@
ID_VIEW_SWAPPANES "Intercambia la posici\xF3n de los dos paneles"
ID_VIEW_LINENUMBERS "Muestra los n\xFAmeros de l\xEDnea\nMostrar n\xFAmeros de l\xEDnea"
ID_VIEW_WORDWRAP "Ajusta la longitud de las l\xEDneas al ancho de panel\nAjuste de l\xEDnea"
+ ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins"
END
// MERGE MENU
Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-02-20 16:22:52 UTC (rev 4118)
@@ -398,6 +398,7 @@
MENUITEM "Visa &mellanslag", ID_VIEW_WHITESPACE
MENUITEM "Visa &radskillnader", ID_VIEW_LINEDIFFS
MENUITEM "Visa rad&nummer", ID_VIEW_LINENUMBERS
+ MENUITEM "View &Margins", ID_VIEW_FILEMARGIN
MENUITEM "R&adbryt rader", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "V\xE4&xla placering", ID_VIEW_SWAPPANES
@@ -2836,6 +2837,7 @@
ID_VIEW_SWAPPANES "V\xE4xlar placering p\xE5 de tv\xE5 filerna"
ID_VIEW_LINENUMBERS "Visar radnummer\nVisa radnummer"
ID_VIEW_WORDWRAP "Startar radbrytning\nRadbrytning"
+ ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins"
END
// MERGE MENU
Modified: trunk/Src/Languages/Turkish/MergeTurkish.rc
===================================================================
--- trunk/Src/Languages/Turkish/MergeTurkish.rc 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/Languages/Turkish/MergeTurkish.rc 2007-02-20 16:22:52 UTC (rev 4118)
@@ -398,6 +398,7 @@
MENUITEM "&Bo\xFEluklar\xFD G\xF6ster", ID_VIEW_WHITESPACE
MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS
MENUITEM "View Line &Numbers", ID_VIEW_LINENUMBERS
+ MENUITEM "View &Margins", ID_VIEW_FILEMARGIN
MENUITEM "W&rap Lines", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "Sw&ap Panes", ID_VIEW_SWAPPANES
@@ -2837,6 +2838,7 @@
ID_VIEW_SWAPPANES "Swap the positions of the two panes"
ID_VIEW_LINENUMBERS "Shows line numbers\nShow Line Numbers"
ID_VIEW_WORDWRAP "Enable word wrap\nWrap Lines"
+ ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins"
END
// MERGE MENU
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/Merge.rc 2007-02-20 16:22:52 UTC (rev 4118)
@@ -408,6 +408,7 @@
MENUITEM "&View Whitespace", ID_VIEW_WHITESPACE
MENUITEM "Vie&w Line Differences", ID_VIEW_LINEDIFFS
MENUITEM "View Line &Numbers", ID_VIEW_LINENUMBERS
+ MENUITEM "View &Margins", ID_VIEW_FILEMARGIN
MENUITEM "W&rap Lines", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "Sw&ap Panes", ID_VIEW_SWAPPANES
@@ -2847,6 +2848,7 @@
ID_VIEW_SWAPPANES "Swap the positions of the two panes"
ID_VIEW_LINENUMBERS "Shows line numbers\nShow Line Numbers"
ID_VIEW_WORDWRAP "Enable word wrap\nWrap Lines"
+ ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins"
END
// MERGE MENU
Modified: trunk/Src/MergeEditView.cpp
===================================================================
--- trunk/Src/MergeEditView.cpp 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/MergeEditView.cpp 2007-02-20 16:22:52 UTC (rev 4118)
@@ -193,6 +193,8 @@
ON_UPDATE_COMMAND_UI(ID_NO_EDIT_SCRIPTS, OnUpdateNoEditScripts)
ON_WM_SIZE()
ON_COMMAND(ID_HELP, OnHelp)
+ ON_COMMAND(ID_VIEW_FILEMARGIN, OnViewMargin)
+ ON_UPDATE_COMMAND_UI(ID_VIEW_FILEMARGIN, OnUpdateViewMargin)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
@@ -2270,6 +2272,8 @@
else
SetInsertTabs(FALSE);
+ SetSelectionMargin(GetOptionsMgr()->GetBool(OPT_VIEW_FILEMARGIN));
+
SetWordWrapping(GetOptionsMgr()->GetBool(OPT_WORDWRAP));
SetViewLineNumbers(GetOptionsMgr()->GetBool(OPT_VIEW_LINENUMBERS));
m_cachedColors.clrDiff = GetOptionsMgr()->GetInt(OPT_CLR_DIFF);
@@ -2885,6 +2889,9 @@
GetDocument()->SwapFiles();
}
+/**
+ * @brief Enable Swap Panes -gui.
+ */
void CMergeEditView::OnUpdateViewSwapPanes(CCmdUI* pCmdUI)
{
pCmdUI->Enable(TRUE);
@@ -2964,6 +2971,7 @@
GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL));
SetWordWrapping(GetOptionsMgr()->GetBool(OPT_WORDWRAP));
SetViewLineNumbers(GetOptionsMgr()->GetBool(OPT_VIEW_LINENUMBERS));
+ SetSelectionMargin(GetOptionsMgr()->GetBool(OPT_VIEW_FILEMARGIN));
// Enable Backspace at beginning of line
SetDisableBSAtSOL(FALSE);
@@ -3013,3 +3021,31 @@
m_pLocationView->UpdateVisiblePos(nTopLine, nBottomLine);
}
}
+
+/**
+ * @brief Enable/Disable view's selection margins.
+ * Selection margins show bookmarks and word-wrap symbols, so they are pretty
+ * useful. But it appears many users don't use/need those features and for them
+ * selection margins are just wasted screen estate.
+ */
+void CMergeEditView::OnViewMargin()
+{
+ BOOL bViewMargin = GetOptionsMgr()->GetBool(OPT_VIEW_FILEMARGIN);
+ GetOptionsMgr()->SaveOption(OPT_VIEW_FILEMARGIN, !bViewMargin);
+
+ SetSelectionMargin(!bViewMargin);
+ CMergeDoc *pDoc = GetDocument();
+ pDoc->RefreshOptions();
+ pDoc->UpdateAllViews(this);
+}
+
+/**
+ * @brief Update GUI for Enable/Disable view's selection margin.
+ * @param [in] pCmdUI Pointer to UI item to update.
+ */
+void CMergeEditView::OnUpdateViewMargin(CCmdUI* pCmdUI)
+{
+ BOOL bViewMargin = GetOptionsMgr()->GetBool(OPT_VIEW_FILEMARGIN);
+ pCmdUI->Enable(TRUE);
+ pCmdUI->SetCheck(bViewMargin);
+}
Modified: trunk/Src/MergeEditView.h
===================================================================
--- trunk/Src/MergeEditView.h 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/MergeEditView.h 2007-02-20 16:22:52 UTC (rev 4118)
@@ -23,7 +23,7 @@
* @brief Declaration file for CMergeEditView
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#if !defined(AFX_MERGEEDITVIEW_H__0CE31CFD_4BEE_4378_ADB4_B7C9F50A9F53__INCLUDED_)
@@ -292,6 +292,8 @@
afx_msg void OnUpdateNoEditScripts(CCmdUI* pCmdUI);
afx_msg void OnSize(UINT nType, int cx, int cy);
afx_msg void OnHelp();
+ afx_msg void OnViewMargin();
+ afx_msg void OnUpdateViewMargin(CCmdUI* pCmdUI);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
Modified: trunk/Src/OptionsDef.h
===================================================================
--- trunk/Src/OptionsDef.h 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/OptionsDef.h 2007-02-20 16:22:52 UTC (rev 4118)
@@ -47,6 +47,7 @@
const TCHAR OPT_BREAK_TYPE[] = _T("Settings/BreakType");
const TCHAR OPT_WORDWRAP[] = _T("Settings/WordWrap");
const TCHAR OPT_VIEW_LINENUMBERS[] = _T("Settings/ViewLineNumbers");
+const TCHAR OPT_VIEW_FILEMARGIN[] = _T("Settings/ViewFileMargin");
const TCHAR OPT_EXT_EDITOR_CMD[] = _T("Settings/ExternalEditor");
const TCHAR OPT_USE_RECYCLE_BIN[] = _T("Settings/UseRecycleBin");
Modified: trunk/Src/OptionsInit.cpp
===================================================================
--- trunk/Src/OptionsInit.cpp 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/OptionsInit.cpp 2007-02-20 16:22:52 UTC (rev 4118)
@@ -45,6 +45,7 @@
m_pOptions->InitOption(OPT_SCROLL_TO_FIRST, false);
m_pOptions->InitOption(OPT_VERIFY_OPEN_PATHS, true);
m_pOptions->InitOption(OPT_AUTO_COMPLETE_SOURCE, (int)0);
+ m_pOptions->InitOption(OPT_VIEW_FILEMARGIN, false);
m_pOptions->InitOption(OPT_BACKUP_FOLDERCMP, false);
m_pOptions->InitOption(OPT_BACKUP_FILECMP, true);
Modified: trunk/Src/editlib/ccrystaltextview.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextview.cpp 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/editlib/ccrystaltextview.cpp 2007-02-20 16:22:52 UTC (rev 4118)
@@ -121,7 +121,16 @@
#define DEFAULT_PRINT_MARGIN 1000 // 10 millimeters
-const UINT MAX_TAB_LEN = 64;
+/** @brief Maximum tab-char width. */
+const UINT MAX_TAB_LEN = 64;
+/** @brief Width of revision marks. */
+const UINT MARGIN_REV_WIDTH = 3;
+
+/** @brief Color of unsaved line revision mark (dark yellow). */
+const COLORREF UNSAVED_REVMARK_CLR = RGB(0xD7, 0xD7, 0x00);
+/** @brief Color of saved line revision mark (green). */
+const COLORREF SAVED_REVMARK_CLR = RGB(0x00, 0xFF, 0x00);
+
#define SMOOTH_SCROLL_FACTOR 6
#define ICON_INDEX_WRAPLINE 15
@@ -1704,13 +1713,32 @@
DrawMargin (CDC * pdc, const CRect & rect, int nLineIndex, int nLineNumber)
{
if (!m_bSelMargin)
+ pdc->FillSolidRect (rect, GetColor (COLORINDEX_BKGND));
+ else
+ pdc->FillSolidRect (rect, GetColor (COLORINDEX_SELMARGIN));
+
+ // We'll always want revision marks so draw them first
+ COLORREF clrRevisionMark = GetColor(COLORINDEX_WHITESPACE);
+ if (m_pTextBuffer)
{
- pdc->FillSolidRect (rect, GetColor (COLORINDEX_BKGND));
- return;
+ // get line revision marks color
+ DWORD dwRevisionNumber = m_pTextBuffer->GetLineRevisionNumber(nLineIndex);
+ if (dwRevisionNumber > 0)
+ {
+ if (m_pTextBuffer->m_dwRevisionNumberOnSave < dwRevisionNumber)
+ clrRevisionMark = UNSAVED_REVMARK_CLR;
+ else
+ clrRevisionMark = SAVED_REVMARK_CLR;
+ }
}
- pdc->FillSolidRect (rect, GetColor (COLORINDEX_SELMARGIN));
+ // draw line revision marks
+ CRect rc(rect.right - MARGIN_REV_WIDTH, rect.top, rect.right, rect.bottom);
+ pdc->FillSolidRect (rc, clrRevisionMark);
+ if (!m_bSelMargin)
+ return;
+
if (m_bViewLineNumbers && nLineNumber > 0)
{
TCHAR szNumbers[32];
@@ -1724,7 +1752,6 @@
pdc->SetTextColor(clrOldColor);
}
- COLORREF clrRevisionMark = GetColor(COLORINDEX_WHITESPACE);
int nImageIndex = -1;
if (nLineIndex >= 0)
{
@@ -1755,25 +1782,7 @@
break;
}
}
-
- if (m_pTextBuffer)
- {
- // get line revision marks color
- DWORD dwRevisionNumber = m_pTextBuffer->GetLineRevisionNumber(nLineIndex);
- if (dwRevisionNumber > 0)
- {
- if (m_pTextBuffer->m_dwRevisionNumberOnSave < dwRevisionNumber)
- clrRevisionMark = RGB(0xD7, 0xD7, 0x00); // dark yellow
- else
- clrRevisionMark = RGB(0x00, 0xFF, 0x00); // green
- }
- }
}
-
- // draw line revision marks
- CRect rc(rect.right - 3, rect.top, rect.right, rect.bottom);
- pdc->FillSolidRect (rc, clrRevisionMark);
-
if (m_pIcons == NULL)
{
m_pIcons = new CImageList;
@@ -5181,7 +5190,7 @@
}
}
else
- ++nMarginWidth; // Do we really want one pixel wide margin?
+ nMarginWidth = MARGIN_REV_WIDTH; // Space for revision marks
return nMarginWidth;
}
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2007-02-19 22:32:17 UTC (rev 4117)
+++ trunk/Src/resource.h 2007-02-20 16:22:52 UTC (rev 4118)
@@ -1070,6 +1070,7 @@
#define ID_EDIT_GOTO_PREV_BOOKMARK 33117
#define ID_EDIT_CLEAR_ALL_BOOKMARKS 33118
#define ID_DEBUG_RESETOPTIONS 33119
+#define ID_VIEW_FILEMARGIN 33120
// Next default values for new objects
//
@@ -1077,7 +1078,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 235
-#define _APS_NEXT_COMMAND_VALUE 33120
+#define _APS_NEXT_COMMAND_VALUE 33121
#define _APS_NEXT_CONTROL_VALUE 1328
#define _APS_NEXT_SYMED_VALUE 113
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-02-20 16:26:53
|
Revision: 4119
http://svn.sourceforge.net/winmerge/?rev=4119&view=rev
Author: kimmov
Date: 2007-02-20 08:26:52 -0800 (Tue, 20 Feb 2007)
Log Message:
-----------
Remove commented out lines
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DiffWrapper.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-20 16:22:52 UTC (rev 4118)
+++ trunk/Src/Changes.txt 2007-02-20 16:26:52 UTC (rev 4119)
@@ -8,6 +8,8 @@
resource.h
Src/editlib: ccrystaltextview.cpp
Src/Languages/*: Merge*.rc
+ Remove commented out lines
+ Src: DiffWrapper.cpp
2007-02-19 Kimmo
PATCH: [ 1663012 ] Fix total count for compare progress dialog
Modified: trunk/Src/DiffWrapper.cpp
===================================================================
--- trunk/Src/DiffWrapper.cpp 2007-02-20 16:22:52 UTC (rev 4118)
+++ trunk/Src/DiffWrapper.cpp 2007-02-20 16:26:52 UTC (rev 4119)
@@ -21,7 +21,7 @@
*
* @date Created: 2003-08-22
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -160,7 +160,6 @@
DIFFOPTIONS tmpOptions = {0};
m_options.GetAsDiffOptions(tmpOptions);
*options = tmpOptions;
-// InternalGetOptions(options);
}
/**
@@ -173,7 +172,6 @@
{
ASSERT(options);
m_options.SetFromDiffOptions(*options);
-// InternalSetOptions(options);
}
/**
@@ -815,7 +813,6 @@
strFile2Temp.Empty();
}
-// SwapToGlobalSettings();
return bRet;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-02-21 15:38:57
|
Revision: 4121
http://svn.sourceforge.net/winmerge/?rev=4121&view=rev
Author: kimmov
Date: 2007-02-21 07:38:52 -0800 (Wed, 21 Feb 2007)
Log Message:
-----------
BUG: [ 1664727 ] Empty file compare looks broken
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/editlib/ccrystaltextview.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-20 16:32:18 UTC (rev 4120)
+++ trunk/Src/Changes.txt 2007-02-21 15:38:52 UTC (rev 4121)
@@ -2,6 +2,9 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-02-21 Kimmo
+ BUG: [ 1664727 ] Empty file compare looks broken
+ Src/editlib: ccrystaltextview.cpp
2007-02-20 WinMerge experimental release 2.7.1.7 (SVN revision 4120)
Modified: trunk/Src/editlib/ccrystaltextview.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextview.cpp 2007-02-20 16:32:18 UTC (rev 4120)
+++ trunk/Src/editlib/ccrystaltextview.cpp 2007-02-21 15:38:52 UTC (rev 4121)
@@ -1717,28 +1717,6 @@
else
pdc->FillSolidRect (rect, GetColor (COLORINDEX_SELMARGIN));
- // We'll always want revision marks so draw them first
- COLORREF clrRevisionMark = GetColor(COLORINDEX_WHITESPACE);
- if (m_pTextBuffer)
- {
- // get line revision marks color
- DWORD dwRevisionNumber = m_pTextBuffer->GetLineRevisionNumber(nLineIndex);
- if (dwRevisionNumber > 0)
- {
- if (m_pTextBuffer->m_dwRevisionNumberOnSave < dwRevisionNumber)
- clrRevisionMark = UNSAVED_REVMARK_CLR;
- else
- clrRevisionMark = SAVED_REVMARK_CLR;
- }
- }
-
- // draw line revision marks
- CRect rc(rect.right - MARGIN_REV_WIDTH, rect.top, rect.right, rect.bottom);
- pdc->FillSolidRect (rc, clrRevisionMark);
-
- if (!m_bSelMargin)
- return;
-
if (m_bViewLineNumbers && nLineNumber > 0)
{
TCHAR szNumbers[32];
@@ -1752,6 +1730,31 @@
pdc->SetTextColor(clrOldColor);
}
+ if (nLineIndex >= 0)
+ {
+ // Draw line revision mark (or background) whenever we have valid lineindex
+ COLORREF clrRevisionMark = GetColor(COLORINDEX_WHITESPACE);
+ if (m_pTextBuffer)
+ {
+ // get line revision marks color
+ DWORD dwRevisionNumber = m_pTextBuffer->GetLineRevisionNumber(nLineIndex);
+ if (dwRevisionNumber > 0)
+ {
+ if (m_pTextBuffer->m_dwRevisionNumberOnSave < dwRevisionNumber)
+ clrRevisionMark = UNSAVED_REVMARK_CLR;
+ else
+ clrRevisionMark = SAVED_REVMARK_CLR;
+ }
+ }
+
+ // draw line revision marks
+ CRect rc(rect.right - MARGIN_REV_WIDTH, rect.top, rect.right, rect.bottom);
+ pdc->FillSolidRect (rc, clrRevisionMark);
+ }
+
+ if (!m_bSelMargin)
+ return;
+
int nImageIndex = -1;
if (nLineIndex >= 0)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-02-22 16:20:45
|
Revision: 4123
http://svn.sourceforge.net/winmerge/?rev=4123&view=rev
Author: kimmov
Date: 2007-02-22 08:20:28 -0800 (Thu, 22 Feb 2007)
Log Message:
-----------
BUG: [ 1664731 ] Margin and line numbers not separated
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/editlib/ccrystaltextview.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-21 16:21:44 UTC (rev 4122)
+++ trunk/Src/Changes.txt 2007-02-22 16:20:28 UTC (rev 4123)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-02-22 Kimmo
+ BUG: [ 1664731 ] Margin and line numbers not separated
+ Src/editlib: ccrystaltextview.cpp
+
2007-02-21 Kimmo
BUG: [ 1664727 ] Empty file compare looks broken
Src/editlib: ccrystaltextview.cpp
Modified: trunk/Src/editlib/ccrystaltextview.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextview.cpp 2007-02-21 16:21:44 UTC (rev 4122)
+++ trunk/Src/editlib/ccrystaltextview.cpp 2007-02-22 16:20:28 UTC (rev 4123)
@@ -1712,7 +1712,7 @@
void CCrystalTextView::
DrawMargin (CDC * pdc, const CRect & rect, int nLineIndex, int nLineNumber)
{
- if (!m_bSelMargin)
+ if (!m_bSelMargin && !m_bViewLineNumbers)
pdc->FillSolidRect (rect, GetColor (COLORINDEX_BKGND));
else
pdc->FillSolidRect (rect, GetColor (COLORINDEX_SELMARGIN));
@@ -5179,21 +5179,22 @@
{
int nMarginWidth = 0;
+ if (m_bViewLineNumbers)
+ {
+ const int nLines = GetLineCount();
+ int nNumbers = 0;
+ int n = 1;
+ for (n = 1; n <= nLines; n *= 10)
+ ++nNumbers;
+ nMarginWidth += GetCharWidth() * nNumbers;
+ }
+
if (m_bSelMargin)
{
nMarginWidth += 18; // Width for markers and some space
- if (m_bViewLineNumbers)
- {
- const int nLines = GetLineCount();
- int nNumbers = 0;
- int n = 1;
- for (n = 1; n <= nLines; n *= 10)
- ++nNumbers;
- nMarginWidth += GetCharWidth() * nNumbers;
- }
}
else
- nMarginWidth = MARGIN_REV_WIDTH; // Space for revision marks
+ nMarginWidth += MARGIN_REV_WIDTH; // Space for revision marks
return nMarginWidth;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-02-22 17:32:16
|
Revision: 4124
http://svn.sourceforge.net/winmerge/?rev=4124&view=rev
Author: kimmov
Date: 2007-02-22 09:32:15 -0800 (Thu, 22 Feb 2007)
Log Message:
-----------
BUG: [ 1664727 ] Empty file compare looks broken
- Fix revision marks for scrachpads
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/editlib/ccrystaltextview.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-22 16:20:28 UTC (rev 4123)
+++ trunk/Src/Changes.txt 2007-02-22 17:32:15 UTC (rev 4124)
@@ -5,6 +5,9 @@
2007-02-22 Kimmo
BUG: [ 1664731 ] Margin and line numbers not separated
Src/editlib: ccrystaltextview.cpp
+ BUG: [ 1664727 ] Empty file compare looks broken
+ Fix revision marks for scrachpads
+ Src/editlib: ccrystaltextview.cpp
2007-02-21 Kimmo
BUG: [ 1664727 ] Empty file compare looks broken
Modified: trunk/Src/editlib/ccrystaltextview.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextview.cpp 2007-02-22 16:20:28 UTC (rev 4123)
+++ trunk/Src/editlib/ccrystaltextview.cpp 2007-02-22 17:32:15 UTC (rev 4124)
@@ -1730,27 +1730,24 @@
pdc->SetTextColor(clrOldColor);
}
- if (nLineIndex >= 0)
- {
- // Draw line revision mark (or background) whenever we have valid lineindex
- COLORREF clrRevisionMark = GetColor(COLORINDEX_WHITESPACE);
- if (m_pTextBuffer)
- {
- // get line revision marks color
- DWORD dwRevisionNumber = m_pTextBuffer->GetLineRevisionNumber(nLineIndex);
- if (dwRevisionNumber > 0)
- {
- if (m_pTextBuffer->m_dwRevisionNumberOnSave < dwRevisionNumber)
- clrRevisionMark = UNSAVED_REVMARK_CLR;
- else
- clrRevisionMark = SAVED_REVMARK_CLR;
- }
- }
+ // Draw line revision mark (or background) whenever we have valid lineindex
+ COLORREF clrRevisionMark = GetColor(COLORINDEX_WHITESPACE);
+ if (nLineIndex >= 0 && m_pTextBuffer)
+ {
+ // get line revision marks color
+ DWORD dwRevisionNumber = m_pTextBuffer->GetLineRevisionNumber(nLineIndex);
+ if (dwRevisionNumber > 0)
+ {
+ if (m_pTextBuffer->m_dwRevisionNumberOnSave < dwRevisionNumber)
+ clrRevisionMark = UNSAVED_REVMARK_CLR;
+ else
+ clrRevisionMark = SAVED_REVMARK_CLR;
+ }
+ }
- // draw line revision marks
- CRect rc(rect.right - MARGIN_REV_WIDTH, rect.top, rect.right, rect.bottom);
- pdc->FillSolidRect (rc, clrRevisionMark);
- }
+ // draw line revision marks
+ CRect rc(rect.right - MARGIN_REV_WIDTH, rect.top, rect.right, rect.bottom);
+ pdc->FillSolidRect (rc, clrRevisionMark);
if (!m_bSelMargin)
return;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-02-22 22:51:17
|
Revision: 4126
http://svn.sourceforge.net/winmerge/?rev=4126&view=rev
Author: kimmov
Date: 2007-02-22 14:51:12 -0800 (Thu, 22 Feb 2007)
Log Message:
-----------
BUG: [ 1666559 ] Error on save option (WinMerge 2.7.1.7)
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/PropBackups.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-22 22:17:32 UTC (rev 4125)
+++ trunk/Src/Changes.txt 2007-02-22 22:51:12 UTC (rev 4126)
@@ -10,6 +10,8 @@
Src/editlib: ccrystaltextview.cpp
BUG: [ 1664832 ] Typo Error in the Registry
ShellExtension: WinMergeShell.rgs
+ BUG: [ 1666559 ] Error on save option (WinMerge 2.7.1.7)
+ Src: PropBackups.cpp
2007-02-21 Kimmo
BUG: [ 1664727 ] Empty file compare looks broken
Modified: trunk/Src/PropBackups.cpp
===================================================================
--- trunk/Src/PropBackups.cpp 2007-02-22 22:17:32 UTC (rev 4125)
+++ trunk/Src/PropBackups.cpp 2007-02-22 22:51:12 UTC (rev 4126)
@@ -81,8 +81,11 @@
{
m_sGlobalFolder.TrimLeft();
m_sGlobalFolder.TrimRight();
- if (m_sGlobalFolder[m_sGlobalFolder.GetLength() - 1] != '\\')
+ if (m_sGlobalFolder.GetLength() > 3&&
+ m_sGlobalFolder[m_sGlobalFolder.GetLength() - 1] != '\\')
+ {
m_sGlobalFolder += "\\";
+ }
m_pOptionsMgr->SaveOption(OPT_BACKUP_FOLDERCMP, m_bCreateForFolderCmp == TRUE);
m_pOptionsMgr->SaveOption(OPT_BACKUP_FILECMP, m_bCreateForFileCmp == TRUE);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-02-23 14:51:00
|
Revision: 4127
http://svn.sourceforge.net/winmerge/?rev=4127&view=rev
Author: kimmov
Date: 2007-02-23 06:50:51 -0800 (Fri, 23 Feb 2007)
Log Message:
-----------
Cleanup WMGotoDlg constructor
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/WMGotoDlg.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-22 22:51:12 UTC (rev 4126)
+++ trunk/Src/Changes.txt 2007-02-23 14:50:51 UTC (rev 4127)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-02-23 Kimmo
+ Cleanup WMGotoDlg constructor
+ Src: WMGotoDlg.cpp
+
2007-02-22 Kimmo
BUG: [ 1664731 ] Margin and line numbers not separated
Src/editlib: ccrystaltextview.cpp
Modified: trunk/Src/WMGotoDlg.cpp
===================================================================
--- trunk/Src/WMGotoDlg.cpp 2007-02-22 22:51:12 UTC (rev 4126)
+++ trunk/Src/WMGotoDlg.cpp 2007-02-23 14:50:51 UTC (rev 4127)
@@ -19,7 +19,7 @@
*
* @brief Implementation of the CWMGotoDlg class
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -38,12 +38,9 @@
CWMGotoDlg::CWMGotoDlg(CWnd* pParent /*=NULL*/)
: CDialog(CWMGotoDlg::IDD, pParent)
+ , m_nFile(-1)
+ , m_nGotoWhat(-1)
{
- //{{AFX_DATA_INIT(CWMGotoDlg)
- m_strParam = _T("");
- m_nFile = -1;
- m_nGotoWhat = -1;
- //}}AFX_DATA_INIT
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-02-23 14:56:34
|
Revision: 4128
http://svn.sourceforge.net/winmerge/?rev=4128&view=rev
Author: kimmov
Date: 2007-02-23 06:56:29 -0800 (Fri, 23 Feb 2007)
Log Message:
-----------
CleanUp VSS dialog class
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/VssPrompt.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-23 14:50:51 UTC (rev 4127)
+++ trunk/Src/Changes.txt 2007-02-23 14:56:29 UTC (rev 4128)
@@ -5,6 +5,8 @@
2007-02-23 Kimmo
Cleanup WMGotoDlg constructor
Src: WMGotoDlg.cpp
+ CleanUp VSS dialog class
+ Src: VssPrompt.cpp
2007-02-22 Kimmo
BUG: [ 1664731 ] Margin and line numbers not separated
Modified: trunk/Src/VssPrompt.cpp
===================================================================
--- trunk/Src/VssPrompt.cpp 2007-02-23 14:50:51 UTC (rev 4127)
+++ trunk/Src/VssPrompt.cpp 2007-02-23 14:56:29 UTC (rev 4128)
@@ -23,7 +23,7 @@
*
* @brief Code for CVssPrompt class
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
@@ -40,18 +40,16 @@
// CVssPrompt dialog
+/**
+ * @brief Default constructor.
+ * @param [in] pParent Pointer to parent component.
+ */
CVssPrompt::CVssPrompt(CWnd* pParent /*=NULL*/)
: CDialog(CVssPrompt::IDD, pParent)
, m_strSelectedDatabase(_T(""))
, m_bMultiCheckouts(FALSE)
, m_bVCProjSync(FALSE)
{
- //{{AFX_DATA_INIT(CVssPrompt)
- m_strProject = _T("");
- m_strUser = _T("");
- m_strPassword = _T("");
- m_strMessage = _T("");
- //}}AFX_DATA_INIT
}
@@ -82,7 +80,11 @@
/////////////////////////////////////////////////////////////////////////////
// CVssPrompt message handlers
-BOOL CVssPrompt::OnInitDialog()
+/**
+ * @brief Initialize the dialog.
+ * @return TRUE, unless focus is modified.
+ */
+BOOL CVssPrompt::OnInitDialog()
{
CDialog::OnInitDialog();
@@ -123,7 +125,10 @@
return TRUE;
}
-void CVssPrompt::OnOK()
+/**
+ * @brief Close dialog with OK-button.
+ */
+void CVssPrompt::OnOK()
{
UpdateData(TRUE);
if (m_strProject.IsEmpty())
@@ -137,7 +142,10 @@
CDialog::OnOK();
}
-void CVssPrompt::OnSaveas()
+/**
+ * @brief Close dialog with Save As -button.
+ */
+void CVssPrompt::OnSaveas()
{
EndDialog(IDC_SAVE_AS);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-02-24 12:02:38
|
Revision: 4129
http://svn.sourceforge.net/winmerge/?rev=4129&view=rev
Author: gerundt
Date: 2007-02-24 04:02:34 -0800 (Sat, 24 Feb 2007)
Log Message:
-----------
PATCH: [ 1667564 ] Various Updates in German Translation
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/German/MergeGerman.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-23 14:56:29 UTC (rev 4128)
+++ trunk/Src/Changes.txt 2007-02-24 12:02:34 UTC (rev 4129)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-02-24 Tim
+ PATCH: [ 1667564 ] Various Updates in German Translation
+ Src/Languages/German: MergeGerman.rc
+
2007-02-23 Kimmo
Cleanup WMGotoDlg constructor
Src: WMGotoDlg.cpp
Modified: trunk/Src/Languages/German/MergeGerman.rc
===================================================================
--- trunk/Src/Languages/German/MergeGerman.rc 2007-02-23 14:56:29 UTC (rev 4128)
+++ trunk/Src/Languages/German/MergeGerman.rc 2007-02-24 12:02:34 UTC (rev 4129)
@@ -396,9 +396,9 @@
MENUITEM "Standard-Schrift &verwenden", ID_VIEW_USEDEFAULTFONT
MENUITEM SEPARATOR
MENUITEM "Leer&zeichen anzeigen", ID_VIEW_WHITESPACE
- MENUITEM "Zeilenuntersc&hied anzeigen", ID_VIEW_LINEDIFFS
+ MENUITEM "Zeilenuntersc&hiede anzeigen", ID_VIEW_LINEDIFFS
MENUITEM "Zeilennu&mmern anzeigen", ID_VIEW_LINENUMBERS
- MENUITEM "View &Margins", ID_VIEW_FILEMARGIN
+ MENUITEM "&R\xE4nder anzeigen", ID_VIEW_FILEMARGIN
MENUITEM "Zeilen &umbrechen", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "Ausschnitt v&ertauschen", ID_VIEW_SWAPPANES
@@ -1376,7 +1376,7 @@
IDD_DIRCMP_REPORT DIALOGEX 0, 0, 268, 81
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Verzeichnis-Vergleichs-Bericht"
+CAPTION "Ordnervergleichs-Bericht"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
LTEXT "&Berichtsdatei:",IDC_STATIC,7,7,100,8
@@ -1573,25 +1573,25 @@
IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
-CAPTION "Backup Files"
+CAPTION "Sicherungsdateien"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
- CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ LTEXT "Sicherungsdateien erzeugen beim:",IDC_STATIC,7,7,222,8
+ CONTROL "&Ordnervergleich",IDC_BACKUP_FOLDERCMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
- CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",
+ CONTROL "&Dateivergleich",IDC_BACKUP_FILECMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
- LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
- CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ LTEXT "Sicherungsdateien erzeugen im:",IDC_STATIC,7,40,222,8
+ CONTROL "Ordner der &urspr\xFCnglichen Datei",IDC_BACKUP_ORIGFOLD,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
- CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ CONTROL "&Globalen Sicherungsordner:",IDC_BACKUP_GLOBALFOLD,"Button",
BS_AUTORADIOBUTTON,17,59,212,10
EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
- PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
- LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
- CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ PUSHBUTTON "Suchen...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Sicherungsdateiname:",IDC_STATIC,7,89,222,8
+ CONTROL ".bak-&Erweiterung anh\xE4ngen",IDC_BACKUP_APPEND_BAK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
- CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ CONTROL "&Zeitstempel anh\xE4ngen",IDC_BACKUP_APPEND_TIME,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
@@ -1956,7 +1956,7 @@
IDS_OPTIONSPG_VERSIONCONTROL "Versionskontrolle"
IDS_OPTIONSPG_CODEPAGE "Zeichensatz"
IDS_OPTIONSPG_ARCHIVE "Archiv-Unterst\xFCtzung"
- IDS_OPTIONSPG_BACKUPS "Backup Files"
+ IDS_OPTIONSPG_BACKUPS "Sicherungsdateien"
END
// WINMERGE CUSTOM STRINGS
@@ -2044,8 +2044,8 @@
// WINDOWS TITLES
STRINGTABLE
BEGIN
- IDS_DIRECTORY_WINDOW_TITLE "Verzeichnis-Vergleichs Ergebnisse"
- IDS_FILE_COMPARISON_TITLE "Datei-Vergleich"
+ IDS_DIRECTORY_WINDOW_TITLE "Ordnervergleichs-Ergebnisse"
+ IDS_FILE_COMPARISON_TITLE "Dateivergleich"
IDS_EMPTY_LEFT_FILE "Unbenannt links"
IDS_EMPTY_RIGHT_FILE "Unbenannt rechts"
END
@@ -2124,7 +2124,7 @@
IDS_FILEPACK_FAILED_RIGHT "Plugin '%2' kann Ihre \xC4nderungen der rechten Datei nicht zur\xFCck in '%1' packen.\n\nDie urspr\xFCngliche Datei wird nicht ge\xE4ndert.\n\nM\xF6chten Sie die ungepackte Version in einer anderen Datei speichern?"
IDS_FILECHANGED_ONDISK "Eine andere Anwendung hat die Datei\n%1\naktualisiert, seit WinMerge sie geladen hat.\n\nGe\xE4nderte Datei \xFCberschreiben?"
IDS_SAVEREADONLY_MULTI "%1\nist als schreibgesch\xFCtzt markiert. M\xF6chten Sie das schreibgesch\xFCtzte Objekt \xFCberschreiben?"
- IDS_FILECHANGED_RESCAN "Eine andere Anwendung hat die Datei\n%1\naktualisiert, seit WinMerge sie das letzte mal gescannt hat.\n\nWenn Sie die Dateien aktualisieren wollen, m\xFCssen Sie den aktuellen Datei-Vergleich schliessen und neu aufrufen."
+ IDS_FILECHANGED_RESCAN "Eine andere Anwendung hat die Datei\n%1\naktualisiert, seit WinMerge sie das letzte mal gescannt hat.\n\nWenn Sie die Dateien aktualisieren wollen, m\xFCssen Sie den aktuellen Dateivergleich schliessen und neu aufrufen."
IDS_SAVE_LEFT_AS "Speichere linke Datei unter"
IDS_SAVE_RIGHT_AS "Speichere rechte Datei unter"
END
@@ -2250,7 +2250,7 @@
BEGIN
IDS_COLHDR_FILENAME "Dateiname"
IDS_COLHDR_DIR "Ordner"
- IDS_COLHDR_RESULT "Vergleichs-Ergebnis"
+ IDS_COLHDR_RESULT "Vergleichsergebnis"
IDS_COLHDR_LTIMEM "Linkes Datum"
IDS_COLHDR_RTIMEM "Rechtes Datum"
IDS_COLHDR_EXTENSION "Erweiterung"
@@ -2292,8 +2292,8 @@
IDS_ABORTED_ITEM "Objekt abgebrochen"
IDS_FILE_SKIPPED "Datei \xFCbersprungen"
IDS_DIR_SKIPPED "Ordner \xFCbersprungen"
- IDS_LEFT_ONLY_IN_FMT "Left only: %1"
- IDS_RIGHT_ONLY_IN_FMT "Right only: %1"
+ IDS_LEFT_ONLY_IN_FMT "Nur Links: %1"
+ IDS_RIGHT_ONLY_IN_FMT "Nur Rechts: %1"
IDS_BIN_FILES_SAME "Bin\xE4rdateien sind identisch"
IDS_IDENTICAL "Identisch"
IDS_BIN_FILES_DIFF "Bin\xE4rdateien sind unterschiedlich"
@@ -2301,7 +2301,7 @@
IDS_LEFTONLY "Nur Links"
IDS_RIGHTONLY "Nur Rechts"
IDS_DIFFERENT "Unterschiedlich"
- IDS_CMPRES_ERROR "Error"
+ IDS_CMPRES_ERROR "Fehler"
END
// DIRECTORY DIFFING : SUMMARY BAR
@@ -2317,7 +2317,7 @@
BEGIN
IDS_COLDESC_FILENAME "Dateiname oder Ordnername."
IDS_COLDESC_DIR "Unterordnername, wenn Unterordner vorhanden sind."
- IDS_COLDESC_RESULT "Vergleichs-Ergebnis, langes Format."
+ IDS_COLDESC_RESULT "Vergleichsergebnis, langes Format."
IDS_COLDESC_LTIMEM "Linkes \xC4nderungsdatum."
IDS_COLDESC_RTIMEM "Rechtes \xC4nderungsdatum."
IDS_COLDESC_EXTENSION "Dateierweiterung."
@@ -2335,7 +2335,7 @@
IDS_COLDESC_NEWER "Zeigt, welche Seite ein neueres \xC4nderungsdatum hat."
IDS_COLDESC_LVERSION "Linke Dateiversion, nur f\xFCr einige Dateitypen."
IDS_COLDESC_RVERSION "Rechte Dateiversion, nur f\xFCr einige Dateitypen."
- IDS_COLDESC_RESULT_ABBR "Vergleichs-Ergebnis, kurzes Format."
+ IDS_COLDESC_RESULT_ABBR "Vergleichsergebnis, kurzes Format."
IDS_COLDESC_LATTRIBUTES "Linke Attribute."
IDS_COLDESC_RATTRIBUTES "Rechte Attribute."
IDS_COLDESC_LEOL_TYPE "Linker Zeilenenden-Typ"
@@ -2448,7 +2448,7 @@
STRINGTABLE
BEGIN
- IDS_DIR_RESULTS_EMPTIED "Die aktuellen Resultate des Verzeichnis-Vergleichs werden gel\xF6scht."
+ IDS_DIR_RESULTS_EMPTIED "Die aktuellen Resultate des Ordnervergleichs werden gel\xF6scht."
IDS_NO_ZIP_SUPPORT "Die Archiv-Unterst\xFCtzung ist nicht aktiviert.\n
Alle erforderlichen Komponenten (7-zip und/oder Merge7z*.dll) f\xFCr die Archiv-Unterst\xFCtzung k\xF6nnen nicht gefunden werden.
Entnehmen Sie dem Handbuch mehr Informationen \xFCber die Archiv-Unterst\xFCtzung und wie sie aktiviert wird."
@@ -2838,7 +2838,7 @@
ID_VIEW_SWAPPANES "Vertauscht die Position der beiden Ausschnitte."
ID_VIEW_LINENUMBERS "Zeigt Zeilennummern an.\nZeilennummern anzeigen"
ID_VIEW_WORDWRAP "Aktiviert das Umbrechen der Zeilen.\nZeilen umbrechen"
- ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins"
+ ID_VIEW_FILEMARGIN "Zeigt Markierungsr\xE4nder f\xFCr beide Ausschnitte an.\nMarkierungsr\xE4nder anzeigen"
END
// MERGE MENU
@@ -2862,16 +2862,16 @@
// TOOLS MENU
STRINGTABLE
BEGIN
- ID_TOOLS_CUSTOMIZECOLUMNS "Ausw\xE4hlen und wieder ordnen der Spalten vom Verzeichnis-Vergleich."
+ ID_TOOLS_CUSTOMIZECOLUMNS "Ausw\xE4hlen und wieder ordnen der Spalten vom Ordnervergleich."
ID_TOOLS_GENERATEPATCH "Erzeugt eine Patchdatei."
ID_TOOLS_FILTERS "Ausw\xE4hlen und modifizieren von Filtern."
- ID_TOOLS_GENERATEREPORT "Erzeugt einen Bericht von den Vergleichs-Ergebnissen."
+ ID_TOOLS_GENERATEREPORT "Erzeugt einen Bericht von den Vergleichsergebnissen."
END
// PLUGINS MENU
STRINGTABLE
BEGIN
- ID_UNPACK_MANUAL "Der Benutzer w\xE4hlt den Entpacker (kein Entpacken beim Verzeichnis-Vergleich)."
+ ID_UNPACK_MANUAL "Der Benutzer w\xE4hlt den Entpacker (kein Entpacken beim Ordnervergleich)."
ID_UNPACK_AUTO "Der passende Entpacker wird auf beide Dateien angewendet (nur eine Datei ben\xF6tigt die Erweiterung)."
ID_POPUP_OPEN_WITH_UNPACKER "Ausw\xE4hlen eines Entpackers zum Bearbeiten dieser Datei."
ID_NO_PREDIFFER "Kein Prediffer (Normal)"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-02-26 17:11:50
|
Revision: 4132
http://svn.sourceforge.net/winmerge/?rev=4132&view=rev
Author: kimmov
Date: 2007-02-26 09:11:47 -0800 (Mon, 26 Feb 2007)
Log Message:
-----------
PATCH: [ 1664689 ] French translation
- Submitted by Jean-F Jolin
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/French/MergeFrench.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-02-26 17:10:10 UTC (rev 4131)
+++ trunk/Src/Changes.txt 2007-02-26 17:11:47 UTC (rev 4132)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-02-26 Kimmo
+ PATCH: [ 1664689 ] French translation
+ Submitted by Jean-F Jolin
+ Src/Languages/French: MergeFrench.rc
+
2007-02-25 Jan Hryz
Czech translation - update
Src/Languages/Czech/MergeCzech.rc
Modified: trunk/Src/Languages/French/MergeFrench.rc
===================================================================
--- trunk/Src/Languages/French/MergeFrench.rc 2007-02-26 17:10:10 UTC (rev 4131)
+++ trunk/Src/Languages/French/MergeFrench.rc 2007-02-26 17:11:47 UTC (rev 4132)
@@ -100,7 +100,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
@@ -124,12 +124,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
@@ -141,7 +141,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
@@ -173,9 +173,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
MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "Fe&n\xEAtre"
@@ -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
MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "Fe&n\xEAtre"
@@ -301,7 +301,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
@@ -319,7 +319,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"
@@ -333,13 +333,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
@@ -359,7 +359,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
@@ -375,12 +375,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
@@ -395,11 +395,11 @@
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 "View &Margins", ID_VIEW_FILEMARGIN
- MENUITEM "W&rap Lines", ID_VIEW_WORDWRAP
+ MENUITEM "Afficher la num\xE9rotation des lignes", ID_VIEW_LINENUMBERS
+ MENUITEM "View &Margins", ID_VIEW_FILEMARGIN
+ 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
@@ -445,9 +445,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
MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
END
POPUP "Fe&n\xEAtre"
@@ -465,7 +465,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
@@ -499,7 +499,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"
@@ -676,7 +676,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
@@ -738,8 +738,8 @@
WS_TABSTOP,7,37,206,10
CONTROL "&Permetre une seule instance en ex\xE9cution",IDC_SINGLE_INSTANCE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,206,10
- LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,62,125,8
- COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
+ LTEXT "Automatisation bo\xEEte de dialogue d'ouverture:",IDC_STATIC,19,62,125,8
+ COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,71,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
GROUPBOX "Qualifier plusieurs fen\xEAtres pour",IDC_STATIC,7,90,
221,37
@@ -747,7 +747,7 @@
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,101,206,10
CONTROL "comparaison de &Fichiers",IDC_MULTIDOC_FILECMP,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,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,143,168,31
PUSHBUTTON "&Initialiser",IDC_RESET_ALL_MESSAGE_BOXES,178,149,50,14,NOT
WS_TABSTOP
@@ -781,7 +781,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 |
@@ -835,9 +835,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
@@ -956,14 +956,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
@@ -1074,17 +1074,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
@@ -1096,12 +1096,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
@@ -1137,8 +1137,8 @@
WS_VSCROLL | WS_TABSTOP
CONTROL "&Arr\xEAter \xE0 la premi\xE8re diff\xE9rence",IDC_COMPARE_STOPFIRST,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,202,10
- GROUPBOX "Comments",IDC_STATIC,7,144,221,32
- CONTROL "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button",
+ GROUPBOX "Commentaires",IDC_STATIC,7,144,221,32
+ CONTROL "Filtrer les commentaires",IDC_FILTERCOMMENTS_CHECK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,15,157,205,10
PUSHBUTTON "&D\xE9fauts",IDC_COMPARE_DEFAULTS,7,189,50,14
END
@@ -1166,9 +1166,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
@@ -1190,7 +1190,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
@@ -1227,7 +1227,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 |
@@ -1256,7 +1256,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
@@ -1264,7 +1264,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,
@@ -1279,12 +1279,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
@@ -1304,8 +1304,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
@@ -1323,50 +1323,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
@@ -1378,13 +1378,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
@@ -1402,7 +1402,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
@@ -1416,47 +1416,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
@@ -1465,108 +1465,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
IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
@@ -1617,7 +1617,7 @@
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"
@@ -1774,13 +1774,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
@@ -1906,8 +1906,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
@@ -1944,7 +1944,7 @@
IDS_OPTIONSPG_EDITOR "\xC9diteur"
IDS_OPTIONSPG_COLORS "Couleurs"
IDS_OPTIONSPG_SYNTAXCOLORS "Couleurs de la syntaxe"
- IDS_OPTIONSPG_TEXTCOLORS "Text Colors"
+ IDS_OPTIONSPG_TEXTCOLORS "Couleurs du texte"
IDS_OPTIONSPG_SYSTEM "Syst\xE8me"
IDS_OPTIONSPG_VERSIONCONTROL "Controle de version"
IDS_OPTIONSPG_CODEPAGE "Page de code"
@@ -1967,9 +1967,9 @@
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_RESET_OPTIONS_WARNING
+ IDS_OPTIONS_INVALID_TABSIZE
+ "Taille d'une tabulation -cette \xE9tendue n'est pas accept\xE9e par WinMerge.\n\nVeuillez utiliser ces valeurs 1 - %1."
+ IDS_RESET_OPTIONS_WARNING
"Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
END
@@ -1981,15 +1981,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
@@ -1998,8 +1998,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
@@ -2012,19 +2012,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
@@ -2074,8 +2074,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
@@ -2110,8 +2110,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 ?"
@@ -2138,8 +2137,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
@@ -2156,15 +2155,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)"
@@ -2191,8 +2190,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
@@ -2216,8 +2215,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"
@@ -2232,10 +2231,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
@@ -2249,8 +2246,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
@@ -2264,8 +2261,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
@@ -2273,8 +2270,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
@@ -2282,7 +2279,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_LEFT_ONLY_IN_FMT "Left only: %1"
@@ -2316,8 +2313,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\xF4t\xE9 droit en octets."
- IDS_COLDESC_LSIZE_SHORT "Left file size abbreviated."
- IDS_COLDESC_RSIZE_SHORT "Right file size abbreviated."
+ IDS_COLDESC_LSIZE_SHORT "Taille du fichier du c\xF4t\xE9 gauche abr\xE9g\xE9e."
+ IDS_COLDESC_RSIZE_SHORT "Taille du fichier du c\xF4t\xE9 droit abr\xE9g\xE9e."
END
// DIRECTORY DIFFING : COLUMN DESCRIPTIONS#2
@@ -2331,8 +2328,8 @@
IDS_COLDESC_RESULT_ABBR "Resultat de la comparison, format abr\xE9g\xE9."
IDS_COLDESC_LATTRIBUTES "Attributs du c\xF4t\xE9 gauche."
IDS_COLDESC_RATTRIBUTES "Attributs du c\xF4t\xE9 droit."
- IDS_COLDESC_LEOL_TYPE "Left side file EOL type"
- IDS_COLDESC_REOL_TYPE "Right side file EOL type"
+ IDS_COLDESC_LEOL_TYPE "Type de fin de ligne du c\xF4t\xE9 gauche"
+ IDS_COLDESC_REOL_TYPE "Type de fin de ligne du c\xF4t\xE9 droit"
END
// DIRECTORY DIFFING : COLUMN DESCRIPTIONS (2)
@@ -2340,8 +2337,8 @@
BEGIN
IDS_COLDESC_LENCODING "Page de code du c\xF4t\xE9 gauche."
IDS_COLDESC_RENCODING "Page de code du c\xF4t\xE9 droit."
- 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 "Nombre total des diff\xE9rences. Elles sont ignor\xE9es par WinMerge et ne peuvent \xEAtre fusionn\xE9es."
+ IDS_COLDESC_NSDIFFS "Nombre de diff\xE9rences \xE0 l'exclusion de celles ignor\xE9es."
IDS_COLDESC_BINARY "Indique un ast\xE9risque (*) si le fichier est binaire."
END
@@ -2352,7 +2349,7 @@
IDS_REPORT_COMMALIST "Liste d\xE9limit\xE9e par des virgules"
IDS_REPORT_TABLIST "Liste d\xE9limit\xE9e par des tabulations"
IDS_REPORT_SIMPL...
[truncated message content] |
|
From: <ki...@us...> - 2007-03-04 14:27:47
|
Revision: 4140
http://svn.sourceforge.net/winmerge/?rev=4140&view=rev
Author: kimmov
Date: 2007-03-04 06:27:39 -0800 (Sun, 04 Mar 2007)
Log Message:
-----------
PATCH: [ 1664689 ] French translation (update)
- Submitted by Jean-F Jolin
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/French/MergeFrench.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-01 17:35:20 UTC (rev 4139)
+++ trunk/Src/Changes.txt 2007-03-04 14:27:39 UTC (rev 4140)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-04 Kimmo
+ PATCH: [ 1664689 ] French translation (update)
+ Submitted by Jean-F Jolin
+ Src/Languages/French: MergeFrench.rc
+
2007-02-27 WinMerge beta release 2.7.2 (revision 4137)
2007-02-27 Kimmo
Modified: trunk/Src/Languages/French/MergeFrench.rc
===================================================================
--- trunk/Src/Languages/French/MergeFrench.rc 2007-03-01 17:35:20 UTC (rev 4139)
+++ trunk/Src/Languages/French/MergeFrench.rc 2007-03-04 14:27:39 UTC (rev 4140)
@@ -176,7 +176,7 @@
POPUP "&D\xE9boguer" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Charger la configuration...", ID_DEBUG_LOADCONFIG
- MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
+ MENUITEM "&Initialiser les pr\xE9f\xE9rences", ID_DEBUG_RESETOPTIONS
END
POPUP "Fe&n\xEAtre"
BEGIN
@@ -284,7 +284,7 @@
POPUP "&D\xE9boguer" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Charger la configuration...", ID_DEBUG_LOADCONFIG
- MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
+ MENUITEM "&Initialiser les pr\xE9f\xE9rences", ID_DEBUG_RESETOPTIONS
END
POPUP "Fe&n\xEAtre"
BEGIN
@@ -377,7 +377,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
@@ -393,11 +393,11 @@
MENUITEM "Choisir une &police...", ID_VIEW_SELECTFONT
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 "Afficher la num\xE9rotation des lignes", ID_VIEW_LINENUMBERS
- MENUITEM "View &Margins", ID_VIEW_FILEMARGIN
- MENUITEM "&Retour \xE0 la ligne automatique", ID_VIEW_WORDWRAP
+ MENUITEM "Afficher les &espaces", ID_VIEW_WHITESPACE
+ MENUITEM "Afficher la &granularit\xE9 des lignes", ID_VIEW_LINEDIFFS
+ MENUITEM "Afficher la &num\xE9rotation des lignes", ID_VIEW_LINENUMBERS
+ MENUITEM "Afficher les &marges", ID_VIEW_FILEMARGIN
+ MENUITEM "&Retour \xE0 la ligne automatique", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "&Intervertir les fen\xEAtres", ID_VIEW_SWAPPANES
MENUITEM SEPARATOR
@@ -448,7 +448,7 @@
POPUP "&D\xE9boguer" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "&Charger la configuration...", ID_DEBUG_LOADCONFIG
- MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
+ MENUITEM "&Initialiser les pr\xE9f\xE9rences", ID_DEBUG_RESETOPTIONS
END
POPUP "Fe&n\xEAtre"
BEGIN
@@ -855,7 +855,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
@@ -1130,7 +1130,7 @@
7,80,221,10
CONTROL "&Qualifier la d\xE9tection des blocs d\xE9plac\xE9s",IDC_MOVED_BLOCKS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,90,221,10
- CONTROL "&Match similar lines",IDC_MATCH_SIMILAR_LINES,"Button",
+ CONTROL "Assortir les &lignes similaires",IDC_MATCH_SIMILAR_LINES,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,100,221,10
LTEXT "&Methode de comparaison:",IDC_STATIC,7,115,100,9
COMBOBOX IDC_COMPAREMETHODCOMBO,110,113,114,70,CBS_DROPDOWNLIST |
@@ -1288,7 +1288,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"
@@ -1308,7 +1308,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
@@ -1571,25 +1571,25 @@
IDD_PROPPAGE_BACKUPS DIALOGEX 0, 0, 236, 222
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
-CAPTION "Backup Files"
+CAPTION "Fichiers d'archive"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
- CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ LTEXT "Cr\xE9er les fichiers d'archive sous:",IDC_STATIC,7,7,222,8
+ CONTROL "R\xE9pertoire de &comparaison",IDC_BACKUP_FOLDERCMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
- CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",
+ CONTROL "&Fichier de comparaison",IDC_BACKUP_FILECMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
- LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
- CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ LTEXT "Cr\xE9er les fichiers d'archive dans:",IDC_STATIC,7,40,222,8
+ CONTROL "&R\xE9pertoire d'&origine du fichier",IDC_BACKUP_ORIGFOLD,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
- CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ CONTROL "R\xE9pertoire d'archive &global:",IDC_BACKUP_GLOBALFOLD,"Button",
BS_AUTORADIOBUTTON,17,59,212,10
EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
- PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
- LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
- CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ PUSHBUTTON "&Parcourir...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "&Nom du fichier d'archive:",IDC_STATIC,7,89,222,8
+ CONTROL "Apposer une &extension .bak",IDC_BACKUP_APPEND_BAK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
- CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ CONTROL "Apposer une estampille &temporelle",IDC_BACKUP_APPEND_TIME,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
@@ -1949,7 +1949,7 @@
IDS_OPTIONSPG_VERSIONCONTROL "Controle de version"
IDS_OPTIONSPG_CODEPAGE "Page de code"
IDS_OPTIONSPG_ARCHIVE "Support des archives"
- IDS_OPTIONSPG_BACKUPS "Backup Files"
+ IDS_OPTIONSPG_BACKUPS "Fichiers d'archive"
END
// WINMERGE CUSTOM STRINGS
@@ -1970,7 +1970,7 @@
IDS_OPTIONS_INVALID_TABSIZE
"Taille d'une tabulation -cette \xE9tendue n'est pas accept\xE9e par WinMerge.\n\nVeuillez utiliser ces valeurs 1 - %1."
IDS_RESET_OPTIONS_WARNING
- "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
+ "Confirmer l'initialisation des valeurs par d\xE9faut des pr\xE9f\xE9rences WinMerge ?\n\nVeuillez red\xE9marrer WinMerge apr\xE8s l'initialisation."
END
// BROWSE FILE
@@ -2282,8 +2282,8 @@
IDS_ABORTED_ITEM "\xC9l\xE9ment abandonn\xE9"
IDS_FILE_SKIPPED "Fichier ignor\xE9"
IDS_DIR_SKIPPED "R\xE9pertoire ignor\xE9"
- IDS_LEFT_ONLY_IN_FMT "Left only: %1"
- IDS_RIGHT_ONLY_IN_FMT "Right only: %1"
+ IDS_LEFT_ONLY_IN_FMT "Juste \xE0 gauche: %1"
+ IDS_RIGHT_ONLY_IN_FMT "Juste \xE0 droite: %1"
IDS_BIN_FILES_SAME "Les fichiers binaires sont identiques"
IDS_IDENTICAL "Identiques"
IDS_BIN_FILES_DIFF "Les fichiers binaires sont diff\xE9rents"
@@ -2291,7 +2291,7 @@
IDS_LEFTONLY "Juste \xE0 gauche"
IDS_RIGHTONLY "Juste \xE0 droite"
IDS_DIFFERENT "Diff\xE9rent"
- IDS_CMPRES_ERROR "Error"
+ IDS_CMPRES_ERROR "Erreur"
END
// DIRECTORY DIFFING : SUMMARY BAR
@@ -2797,7 +2797,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"
@@ -2828,7 +2828,7 @@
ID_VIEW_SWAPPANES "Intervertir la position de deux fen\xEAtres"
ID_VIEW_LINENUMBERS^ "Afficher la num\xE9rotation des lignes\nAfficher la num\xE9rotation des lignes"
ID_VIEW_WORDWRAP "Afficher ou masquer le retour \xE0 la ligne automatique\nRetour \xE0 la ligne automatique"
- ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins"
+ ID_VIEW_FILEMARGIN "Afficher les marges des deux fen\xEAtres\nAfficher les marges"
END
// MERGE MENU
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:21
|
Revision: 4141
http://svn.sourceforge.net/winmerge/?rev=4141&view=rev
Author: gerundt
Date: 2007-03-04 06:33:14 -0800 (Sun, 04 Mar 2007)
Log Message:
-----------
BUG: [ 1668996 ] Two "Copy Right" buttons in Russian GUI.
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/Russian/MergeRussian.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-04 14:27:39 UTC (rev 4140)
+++ trunk/Src/Changes.txt 2007-03-04 14:33:14 UTC (rev 4141)
@@ -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-04 Kimmo
PATCH: [ 1664689 ] French translation (update)
Submitted by Jean-F Jolin
Modified: trunk/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- trunk/Src/Languages/Russian/MergeRussian.rc 2007-03-04 14:27:39 UTC (rev 4140)
+++ trunk/Src/Languages/Russian/MergeRussian.rc 2007-03-04 14:33:14 UTC (rev 4141)
@@ -2843,7 +2843,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: <ki...@us...> - 2007-03-04 14:45:05
|
Revision: 4143
http://svn.sourceforge.net/winmerge/?rev=4143&view=rev
Author: kimmov
Date: 2007-03-04 06:45:02 -0800 (Sun, 04 Mar 2007)
Log Message:
-----------
PATCH: [ 1673082 ] Polish translation for WM CVS
- Submitted by dr_prozac
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/Polish/MergePolish.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-04 14:33:52 UTC (rev 4142)
+++ trunk/Src/Changes.txt 2007-03-04 14:45:02 UTC (rev 4143)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-04 Kimmo
+ PATCH: [ 1673082 ] Polish translation for WM CVS
+ Submitted by dr_prozac
+ Src/Languages/Polish: MergePolish.rc
+
2007-03-04 Tim
BUG: [ 1668996 ] Two "Copy Right" buttons in Russian GUI.
Src/Languages/Russian: MergeRussian.rc
Modified: trunk/Src/Languages/Polish/MergePolish.rc
===================================================================
--- trunk/Src/Languages/Polish/MergePolish.rc 2007-03-04 14:33:52 UTC (rev 4142)
+++ trunk/Src/Languages/Polish/MergePolish.rc 2007-03-04 14:45:02 UTC (rev 4143)
@@ -102,7 +102,7 @@
MENUITEM "Kopiuj na praw\xB9", ID_L2R
MENUITEM "Kopiuj na lew\xB9", ID_R2L
MENUITEM SEPARATOR
- MENUITEM "&Select Line Difference", ID_SELECTLINEDIFF
+ MENUITEM "Zaznacz r\xF3\xBFnic\xEA w &linii", ID_SELECTLINEDIFF
MENUITEM SEPARATOR
MENUITEM "&Cofnij", ID_EDIT_UNDO
MENUITEM "&Powt\xF3rz", ID_EDIT_REDO
@@ -149,7 +149,7 @@
END
POPUP "&Edycja"
BEGIN
- MENUITEM "W\xB3&a\x9Cciwo\x9Cci...", ID_OPTIONS
+ MENUITEM "&Opcje...", ID_OPTIONS
END
POPUP "&Widok"
BEGIN
@@ -178,7 +178,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "Za\xB3a&duj ustawienia...", ID_DEBUG_LOADCONFIG
- MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
+ MENUITEM "Ze&ruj opcje", ID_DEBUG_RESETOPTIONS
END
POPUP "&Okno"
BEGIN
@@ -226,7 +226,7 @@
BEGIN
MENUITEM "Wybierz &wszystkie\tCtrl+A", ID_EDIT_SELECT_ALL
MENUITEM SEPARATOR
- MENUITEM "W\xB3&a\x9Cciwo\x9Cci...", ID_OPTIONS
+ MENUITEM "&Opcje...", ID_OPTIONS
MENUITEM SEPARATOR
MENUITEM "O&d\x9Cwie\xBF\tF5", ID_REFRESH
MENUITEM "&Od\x9Cwie\xBF zaznaczone\tCtrl+F5", ID_DIR_RESCAN
@@ -286,7 +286,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "Za\xB3a&duj ustawienia...", ID_DEBUG_LOADCONFIG
- MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
+ MENUITEM "Ze&ruj opcje", ID_DEBUG_RESETOPTIONS
END
POPUP "&Okno"
BEGIN
@@ -386,7 +386,7 @@
END
MENUITEM "&Id\x9F do...\tCtrl+G", ID_EDIT_WMGOTO
MENUITEM SEPARATOR
- MENUITEM "W\xB3&a\x9Cciwo\x9Cci...", ID_OPTIONS
+ MENUITEM "&Opcje...", ID_OPTIONS
MENUITEM SEPARATOR
MENUITEM "O&d\x9Cwie\xBF\tF5", ID_REFRESH
END
@@ -398,7 +398,7 @@
MENUITEM "&Poka\xBF bia\xB3e znaki", ID_VIEW_WHITESPACE
MENUITEM "Poka\xBF r\xF3\xBFnice &linii", ID_VIEW_LINEDIFFS
MENUITEM "Poka\xBF &numery linii", ID_VIEW_LINENUMBERS
- MENUITEM "View &Margins", ID_VIEW_FILEMARGIN
+ MENUITEM "Poka\xBF &marginesy", ID_VIEW_FILEMARGIN
MENUITEM "Za&wijaj linie", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "Za&mie\xF1 panele", ID_VIEW_SWAPPANES
@@ -450,7 +450,7 @@
POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
MENUITEM "Za\xB3a&duj ustawienia...", ID_DEBUG_LOADCONFIG
- MENUITEM "&Reset Options", ID_DEBUG_RESETOPTIONS
+ MENUITEM "Ze&ruj opcje", ID_DEBUG_RESETOPTIONS
END
POPUP "&Okno"
BEGIN
@@ -1576,22 +1576,22 @@
CAPTION "Backup Files"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "Create backup files in:",IDC_STATIC,7,7,222,8
- CONTROL "&Folder compare",IDC_BACKUP_FOLDERCMP,"Button",
+ LTEXT "Tw\xF3rz kopie plik\xF3w w:",IDC_STATIC,7,7,222,8
+ CONTROL "Por\xF3wnanie &folder\xF3w",IDC_BACKUP_FOLDERCMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,17,212,10
- CONTROL "Fil&e compare",IDC_BACKUP_FILECMP,"Button",
+ CONTROL "Por\xF3wnani&e plik\xF3w",IDC_BACKUP_FILECMP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,27,212,10
- LTEXT "Create backup files into:",IDC_STATIC,7,40,222,8
- CONTROL "&Original file's folder",IDC_BACKUP_ORIGFOLD,"Button",
+ LTEXT "Tw\xF3rz pliki kopii w:",IDC_STATIC,7,40,222,8
+ CONTROL "Folder oryginalnego pliku",IDC_BACKUP_ORIGFOLD,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,17,50,212,10
- CONTROL "&Global backup folder:",IDC_BACKUP_GLOBALFOLD,"Button",
+ CONTROL "&Globalny folder dla kopii:",IDC_BACKUP_GLOBALFOLD,"Button",
BS_AUTORADIOBUTTON,17,59,212,10
EDITTEXT IDC_BACKUP_FOLDER,29,70,145,14,ES_AUTOHSCROLL
- PUSHBUTTON "Browse...",IDC_BACKUP_BROWSE,179,70,50,14
- LTEXT "Backup filename:",IDC_STATIC,7,89,222,8
- CONTROL "&Append .bak -extension",IDC_BACKUP_APPEND_BAK,"Button",
+ PUSHBUTTON "Przegl\xB9daj...",IDC_BACKUP_BROWSE,179,70,50,14
+ LTEXT "Nazwa pliku kopii:",IDC_STATIC,7,89,222,8
+ CONTROL "Dod&aj rozszerzenie .bak",IDC_BACKUP_APPEND_BAK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,99,212,10
- CONTROL "A&ppend timestamp",IDC_BACKUP_APPEND_TIME,"Button",
+ CONTROL "Dodaj znacznik czasu",IDC_BACKUP_APPEND_TIME,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,109,212,10
END
@@ -1626,7 +1626,7 @@
VALUE "OriginalFilename", "WinMerge.EXE\0"
VALUE "PrivateBuild", ""
VALUE "ProductName", "WinMerge\0"
- VALUE "ProductVersion", "2.6.4\0"
+ VALUE "ProductVersion", "2.7.2\0"
END
END
BLOCK "VarFileInfo"
@@ -1938,7 +1938,7 @@
IDS_MESSAGEBOX_SKIP "Pom&i\xF1"
IDS_MESSAGEBOX_SKIPALL "Pomi\xF1 ws&zystkie"
IDS_MESSAGEBOX_HELP "&Pomoc"
- IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN "Nie wy\x9Cwietlaj komunikatu ponownie."
+ IDS_MESSAGEBOX_DONT_DISPLAY_AGAIN "Nie wy\x9Cwietlaj ponownie tego komunikatu."
IDS_MESSAGEBOX_DONT_ASK_AGAIN "Nie &pytaj ponownie."
END
@@ -1955,7 +1955,7 @@
IDS_OPTIONSPG_VERSIONCONTROL "Kontrola wersji"
IDS_OPTIONSPG_CODEPAGE "Strona kodowa"
IDS_OPTIONSPG_ARCHIVE "Wsparcie dla archiw\xF3w"
- IDS_OPTIONSPG_BACKUPS "Backup Files"
+ IDS_OPTIONSPG_BACKUPS "Pliki kopii"
END
// WINMERGE CUSTOM STRINGS
@@ -1976,7 +1976,7 @@
IDS_OPTIONS_INVALID_TABSIZE
"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."
IDS_RESET_OPTIONS_WARNING
- "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
+ "Czy jeste\x9C pewien, \xBFe chcesz wyzerowa\xE6 wszystkie opcje WinMerge i przywr\xF3cic warto\x9Cci domy\x9Clne ?\n\nPo wyzerowaniu konieczne b\xEAdzie ponowne uruchomienie programu."
END
// BROWSE FILE
@@ -2750,13 +2750,13 @@
IDS_CP_WINDOWS_JAPANESE_EXTRA ""
IDS_CP_WINDOWS_CHINESE_SIMP_EXTRA ""
IDS_CP_WINDOWS_KOREAN_EXTRA ""
- IDS_CP_WINDOWS_LATIN2_EXTRA "Przybli\xBFenie ISO-8859-2"
+ IDS_CP_WINDOWS_LATIN2_EXTRA "Kodowanie ISO-8859-2"
IDS_CP_WINDOWS_CHINESE_TRAD_EXTRA ""
IDS_CP_WINDOWS_CYRILLIC_EXTRA ""
- IDS_CP_WINDOWS_LATIN1_EXTRA "Przybli\xBFenie ISO-8859-1"
- IDS_CP_WINDOWS_GREEK_EXTRA "Przybli\xBFenie ISO-8859-7"
- IDS_CP_WINDOWS_TURKISH_EXTRA "Przybli\xBFenie ISO-8859-9"
- IDS_CP_WINDOWS_HEBREW_EXTRA "Przybli\xBFenie ISO-8859-8"
+ IDS_CP_WINDOWS_LATIN1_EXTRA "Kodowanie ISO-8859-1"
+ IDS_CP_WINDOWS_GREEK_EXTRA "Kodowanie ISO-8859-7"
+ IDS_CP_WINDOWS_TURKISH_EXTRA "Kodowanie ISO-8859-9"
+ IDS_CP_WINDOWS_HEBREW_EXTRA "Kodowanie ISO-8859-8"
END
// EOL types shown in folder compare EOL type column
@@ -2837,7 +2837,7 @@
ID_VIEW_SWAPPANES "Zamie\xF1 pozycje dw\xF3ch okien"
ID_VIEW_LINENUMBERS "Poka\xBF numery linii\nPoka\xBF numery linii"
ID_VIEW_WORDWRAP "W\xB3\xB9cz zawijanie s\xB3\xF3w\nZawijaj linie"
- ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins"
+ ID_VIEW_FILEMARGIN "Pokazuje marginesy zaznaczenie dla obu paneli\nPoka\xBF marginesy zaznaczenia"
END
// MERGE MENU
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-03-06 20:09:36
|
Revision: 4146
http://svn.sourceforge.net/winmerge/?rev=4146&view=rev
Author: kimmov
Date: 2007-03-06 12:09:22 -0800 (Tue, 06 Mar 2007)
Log Message:
-----------
PATCH: [ 1673908 ] Update of Swedish translation for "View margins"
- Submitted by Hans Eriksson
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/Swedish/MergeSwedish.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2007-03-04 18:20:54 UTC (rev 4145)
+++ trunk/Src/Changes.txt 2007-03-06 20:09:22 UTC (rev 4146)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-06 Kimmo
+ PATCH: [ 1673908 ] Update of Swedish translation for "View margins"
+ Submitted by Hans Eriksson
+ Src/Languages/Swedish: MergeSwedish.rc
+
2007-03-04 Kimmo
PATCH: [ 1673082 ] Polish translation for WM CVS
Submitted by dr_prozac
Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-03-04 18:20:54 UTC (rev 4145)
+++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2007-03-06 20:09:22 UTC (rev 4146)
@@ -398,7 +398,7 @@
MENUITEM "Visa &mellanslag", ID_VIEW_WHITESPACE
MENUITEM "Visa &radskillnader", ID_VIEW_LINEDIFFS
MENUITEM "Visa rad&nummer", ID_VIEW_LINENUMBERS
- MENUITEM "View &Margins", ID_VIEW_FILEMARGIN
+ MENUITEM "Visa &marginaler", ID_VIEW_FILEMARGIN
MENUITEM "R&adbryt rader", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "V\xE4&xla placering", ID_VIEW_SWAPPANES
@@ -2837,7 +2837,7 @@
ID_VIEW_SWAPPANES "V\xE4xlar placering p\xE5 de tv\xE5 filerna"
ID_VIEW_LINENUMBERS "Visar radnummer\nVisa radnummer"
ID_VIEW_WORDWRAP "Startar radbrytning\nRadbrytning"
- ID_VIEW_FILEMARGIN "Shows selection margins for both panes\nShow Selection Margins"
+ ID_VIEW_FILEMARGIN "Visar marginaler f\xF6r b\xE5da filerna\nVisa filmarginaler"
END
// MERGE MENU
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
