You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(148) |
Oct
(84) |
Nov
(130) |
Dec
(121) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(89) |
Feb
(50) |
Mar
(81) |
Apr
(45) |
May
(42) |
Jun
(46) |
Jul
(40) |
Aug
(98) |
Sep
(80) |
Oct
(101) |
Nov
(128) |
Dec
(46) |
| 2008 |
Jan
(132) |
Feb
(117) |
Mar
(118) |
Apr
(112) |
May
(69) |
Jun
(140) |
Jul
(164) |
Aug
(159) |
Sep
(115) |
Oct
(65) |
Nov
(80) |
Dec
(128) |
| 2009 |
Jan
(145) |
Feb
(97) |
Mar
(118) |
Apr
(87) |
May
(96) |
Jun
(83) |
Jul
(50) |
Aug
(42) |
Sep
(18) |
Oct
(32) |
Nov
(12) |
Dec
(35) |
| 2010 |
Jan
(38) |
Feb
(8) |
Mar
(5) |
Apr
(19) |
May
(23) |
Jun
(39) |
Jul
(16) |
Aug
(4) |
Sep
(60) |
Oct
(100) |
Nov
(57) |
Dec
(43) |
| 2011 |
Jan
(25) |
Feb
(1) |
Mar
(3) |
Apr
|
May
(13) |
Jun
(19) |
Jul
|
Aug
(6) |
Sep
(5) |
Oct
(6) |
Nov
|
Dec
(1) |
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <chr...@us...> - 2010-10-20 04:36:25
|
Revision: 7319
http://winmerge.svn.sourceforge.net/winmerge/?rev=7319&view=rev
Author: christianlist
Date: 2010-10-20 04:36:19 +0000 (Wed, 20 Oct 2010)
Log Message:
-----------
Upped the version numbers to match the experimental release 2.15.20, and also increased the ShellExtension version number to be higher than what we currently use in trunk.
Modified Paths:
--------------
branches/R2_14/versions.ini
Modified: branches/R2_14/versions.ini
===================================================================
--- branches/R2_14/versions.ini 2010-10-19 17:57:24 UTC (rev 7318)
+++ branches/R2_14/versions.ini 2010-10-20 04:36:19 UTC (rev 7319)
@@ -7,19 +7,19 @@
description = WinMerge InnoSetup installer
path = Installer/InnoSetup/WinMerge.iss
macro = AppVersion
-version = "2.13.19"
+version = "2.13.20"
[Executable]
type = WinRC
description = WinMerge executable
path = Src/Merge.rc
-version = "2.13.19"
+version = "2.13.20"
[Dll]
type = WinRC
description = ShellExtension
path = ShellExtension/ShellExtension.rc
-version = "1.15.3"
+version = "1.16.5"
[Manual]
type = Docbook
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-10-19 17:57:31
|
Revision: 7318
http://winmerge.svn.sourceforge.net/winmerge/?rev=7318&view=rev
Author: kimmov
Date: 2010-10-19 17:57:24 +0000 (Tue, 19 Oct 2010)
Log Message:
-----------
PATCH: [ 2726531 ] Show XML config files like XML files
Submitted by bulklodd
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/Src/MergeDoc.cpp
branches/R2_14/Src/editlib/ccrystaltextview.cpp
branches/R2_14/Src/editlib/ccrystaltextview.h
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-19 17:40:49 UTC (rev 7317)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-19 17:57:24 UTC (rev 7318)
@@ -10,6 +10,7 @@
Show only "Copy to other side" item in file compare
context menu (#2600787)
Expand/collapse folders from keyboard (#2203904)
+ Improve detecting XML files in file compare (#2726531)
New translation: Persian (#2877121, #3065119)
New translation: Serbian (#3017674, #3065119)
Installer: Drop Windows 9x/ME/NT4 support and use Microsoft runtime
Modified: branches/R2_14/Src/MergeDoc.cpp
===================================================================
--- branches/R2_14/Src/MergeDoc.cpp 2010-10-19 17:40:49 UTC (rev 7317)
+++ branches/R2_14/Src/MergeDoc.cpp 2010-10-19 17:57:24 UTC (rev 7318)
@@ -2316,6 +2316,17 @@
pRightDetail->SetTextType(sextR.c_str());
}
+ // If textypes of the files aren't recogzined by their extentions,
+ // try to recognize them using their first lines
+ if (!bLeftTyped && !bRightTyped)
+ {
+ CString sFirstLine;
+ m_ptBuf[0]->GetLine(0, sFirstLine);
+ bLeftTyped = pLeft->SetTextTypeByContent(sFirstLine);
+ m_ptBuf[1]->GetLine(0, sFirstLine);
+ bRightTyped = pRight->SetTextTypeByContent(sFirstLine);
+ }
+
// If other side didn't have recognized texttype, apply recognized
// type to unrecognized one. (comparing file.cpp and file.bak applies
// cpp file type to .bak file.
Modified: branches/R2_14/Src/editlib/ccrystaltextview.cpp
===================================================================
--- branches/R2_14/Src/editlib/ccrystaltextview.cpp 2010-10-19 17:40:49 UTC (rev 7317)
+++ branches/R2_14/Src/editlib/ccrystaltextview.cpp 2010-10-19 17:57:24 UTC (rev 7318)
@@ -6186,6 +6186,19 @@
}
}
+// Analyze the first line of file to detect its type
+// Mainly it works for xml files
+bool CCrystalTextView::
+SetTextTypeByContent (LPCTSTR pszContent)
+{
+ int nLen;
+ if (::FindStringHelper(pszContent, _T("^\\s*\\<\\?xml\\s+.+?\\?\\>\\s*$"),
+ FIND_REGEXP, nLen) == 0)
+ {
+ return SetTextType(CCrystalTextView::SRC_XML);
+ }
+ return false;
+}
////////////////////////////////////////////////////////////////////////////
#pragma warning ( default : 4100 )
Modified: branches/R2_14/Src/editlib/ccrystaltextview.h
===================================================================
--- branches/R2_14/Src/editlib/ccrystaltextview.h 2010-10-19 17:40:49 UTC (rev 7317)
+++ branches/R2_14/Src/editlib/ccrystaltextview.h 2010-10-19 17:57:24 UTC (rev 7318)
@@ -790,6 +790,7 @@
virtual bool SetTextType (LPCTSTR pszExt);
virtual bool SetTextType (CCrystalTextView::TextType enuType);
virtual bool SetTextType (CCrystalTextView::TextDefinition *def);
+ virtual bool SetTextTypeByContent (LPCTSTR pszContent);
static void LoadSettings ();
static void SaveSettings ();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-10-19 17:40:58
|
Revision: 7317
http://winmerge.svn.sourceforge.net/winmerge/?rev=7317&view=rev
Author: kimmov
Date: 2010-10-19 17:40:49 +0000 (Tue, 19 Oct 2010)
Log Message:
-----------
RFE: [ 2203904 ] "Include Subfolders": Enable Keyboard for Collapse/Expand
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/Src/DirView.cpp
branches/R2_14/Src/DirView.h
branches/R2_14/Src/Languages/English.pot
branches/R2_14/Src/Merge.rc
branches/R2_14/Src/resource.h
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-19 17:25:09 UTC (rev 7316)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-19 17:40:49 UTC (rev 7317)
@@ -9,6 +9,7 @@
Fix help locations (#2988974)
Show only "Copy to other side" item in file compare
context menu (#2600787)
+ Expand/collapse folders from keyboard (#2203904)
New translation: Persian (#2877121, #3065119)
New translation: Serbian (#3017674, #3065119)
Installer: Drop Windows 9x/ME/NT4 support and use Microsoft runtime
Modified: branches/R2_14/Src/DirView.cpp
===================================================================
--- branches/R2_14/Src/DirView.cpp 2010-10-19 17:25:09 UTC (rev 7316)
+++ branches/R2_14/Src/DirView.cpp 2010-10-19 17:40:49 UTC (rev 7317)
@@ -250,6 +250,8 @@
ON_COMMAND(ID_EDIT_UNDO, OnEditUndo)
ON_UPDATE_COMMAND_UI(ID_EDIT_UNDO, OnUpdateEditUndo)
ON_COMMAND(ID_PLUGINS_LIST, OnPluginsList)
+ ON_COMMAND(ID_VIEW_EXPAND, OnExpandFolder)
+ ON_COMMAND(ID_VIEW_COLLAPSE, OnCollapseFolder)
//}}AFX_MSG_MAP
ON_NOTIFY_REFLECT(LVN_COLUMNCLICK, OnColumnClick)
ON_NOTIFY_REFLECT(LVN_ITEMCHANGED, OnItemChanged)
@@ -1102,6 +1104,38 @@
}
/**
+ * @brief Expand collapsed folder in tree-view mode.
+ */
+void CDirView::OnExpandFolder()
+{
+ const int nSelItem = m_pList->GetNextItem(-1, LVNI_SELECTED);
+ if (nSelItem == -1)
+ return;
+ const DIFFITEM &di = GetItemAt(nSelItem);
+ if (di.diffcode.isDirectory() && (di.customFlags1 &
+ ViewCustomFlags::EXPANDED) == 0)
+ {
+ ExpandSubdir(nSelItem);
+ }
+}
+
+/**
+ * @brief Collapse expanded folder in tree-view mode.
+ */
+void CDirView::OnCollapseFolder()
+{
+ const int nSelItem = m_pList->GetNextItem(-1, LVNI_SELECTED);
+ if (nSelItem == -1)
+ return;
+ const DIFFITEM &di = GetItemAt(nSelItem);
+ if (di.diffcode.isDirectory() && (di.customFlags1 &
+ ViewCustomFlags::EXPANDED))
+ {
+ CollapseSubdir(nSelItem);
+ }
+}
+
+/**
* @brief Collapse subfolder
* @param [in] sel Folder item index in listview.
*/
Modified: branches/R2_14/Src/DirView.h
===================================================================
--- branches/R2_14/Src/DirView.h 2010-10-19 17:25:09 UTC (rev 7316)
+++ branches/R2_14/Src/DirView.h 2010-10-19 17:40:49 UTC (rev 7317)
@@ -397,6 +397,8 @@
afx_msg void OnBeginLabelEdit(NMHDR* pNMHDR, LRESULT* pResult);
afx_msg void OnEndLabelEdit(NMHDR* pNMHDR, LRESULT* pResult);
afx_msg void OnPluginsList();
+ afx_msg void OnExpandFolder();
+ afx_msg void OnCollapseFolder();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
BOOL OnHeaderBeginDrag(LPNMHEADER hdr, LRESULT* pResult);
Modified: branches/R2_14/Src/Languages/English.pot
===================================================================
--- branches/R2_14/Src/Languages/English.pot 2010-10-19 17:25:09 UTC (rev 7316)
+++ branches/R2_14/Src/Languages/English.pot 2010-10-19 17:40:49 UTC (rev 7317)
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: WinMerge\n"
-"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
-"POT-Creation-Date: 2009-02-10 22:14+0000\n"
+"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
+"POT-Creation-Date: 2010-10-19 20:38+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <win...@li...>\n"
@@ -385,7 +385,7 @@
#: Merge.rc:175
#: Merge.rc:296
#: Merge.rc:484
-#: Merge.rc:1933
+#: Merge.rc:1935
#, c-format
msgid "&Help"
msgstr ""
@@ -716,7 +716,7 @@
msgstr ""
#: Merge.rc:370
-#: Merge.rc:2789
+#: Merge.rc:2791
#, c-format
msgid "< Empty >"
msgstr ""
@@ -913,15 +913,15 @@
msgstr ""
#: Merge.rc:522
-#: Merge.rc:1135
-#: Merge.rc:1517
+#: Merge.rc:1137
+#: Merge.rc:1519
#, c-format
msgid "&Left"
msgstr ""
#: Merge.rc:523
-#: Merge.rc:1137
-#: Merge.rc:1520
+#: Merge.rc:1139
+#: Merge.rc:1522
#, c-format
msgid "&Right"
msgstr ""
@@ -1051,1719 +1051,1717 @@
msgid "Moved Block for &Current Diff"
msgstr ""
-#: Merge.rc:662
+#: Merge.rc:664
#, c-format
msgid "About WinMerge"
msgstr ""
-#: Merge.rc:668
+#: Merge.rc:670
#, c-format
msgid "(Private Build)"
msgstr ""
-#: Merge.rc:669
+#: Merge.rc:671
#, c-format
msgid "All rights reserved."
msgstr ""
-#: Merge.rc:670
+#: Merge.rc:672
#, c-format
msgid "Visit the WinMerge HomePage!"
msgstr ""
-#: Merge.rc:673
-#: Merge.rc:705
-#: Merge.rc:797
-#: Merge.rc:983
-#: Merge.rc:1054
-#: Merge.rc:1083
-#: Merge.rc:1093
-#: Merge.rc:1259
-#: Merge.rc:1323
-#: Merge.rc:1336
-#: Merge.rc:1428
-#: Merge.rc:1443
-#: Merge.rc:1665
+#: Merge.rc:675
+#: Merge.rc:707
+#: Merge.rc:799
+#: Merge.rc:985
+#: Merge.rc:1056
+#: Merge.rc:1085
+#: Merge.rc:1095
+#: Merge.rc:1261
+#: Merge.rc:1325
+#: Merge.rc:1338
+#: Merge.rc:1430
+#: Merge.rc:1445
+#: Merge.rc:1667
#, c-format
msgid "OK"
msgstr ""
-#: Merge.rc:674
+#: Merge.rc:676
#, c-format
msgid "Contributors"
msgstr ""
-#: Merge.rc:681
+#: Merge.rc:683
#, c-format
msgid "Select Files or Folders"
msgstr ""
-#: Merge.rc:684
-#: Merge.rc:1594
+#: Merge.rc:686
+#: Merge.rc:1596
#, c-format
msgid "&Left:"
msgstr ""
-#: Merge.rc:688
-#: Merge.rc:749
-#: Merge.rc:997
-#: Merge.rc:1019
+#: Merge.rc:690
+#: Merge.rc:751
+#: Merge.rc:999
+#: Merge.rc:1021
#, c-format
msgid "&Browse..."
msgstr ""
-#: Merge.rc:689
-#: Merge.rc:1598
+#: Merge.rc:691
+#: Merge.rc:1600
#, c-format
msgid "&Right:"
msgstr ""
-#: Merge.rc:693
-#: Merge.rc:1030
+#: Merge.rc:695
+#: Merge.rc:1032
#, c-format
msgid "Bro&wse..."
msgstr ""
-#: Merge.rc:694
-#: Merge.rc:1602
+#: Merge.rc:696
+#: Merge.rc:1604
#, c-format
msgid "&Filter:"
msgstr ""
-#: Merge.rc:697
-#: Merge.rc:1604
+#: Merge.rc:699
+#: Merge.rc:1606
#, c-format
msgid "Select..."
msgstr ""
-#: Merge.rc:698
+#: Merge.rc:700
#, c-format
msgid "&Unpacker:"
msgstr ""
-#: Merge.rc:701
+#: Merge.rc:703
#, c-format
msgid "&Select..."
msgstr ""
-#: Merge.rc:702
-#: Merge.rc:1605
+#: Merge.rc:704
+#: Merge.rc:1607
#, c-format
msgid "&Include Subfolders"
msgstr ""
-#: Merge.rc:704
+#: Merge.rc:706
#, c-format
msgid "Status:"
msgstr ""
-#: Merge.rc:706
-#: Merge.rc:736
-#: Merge.rc:798
-#: Merge.rc:828
-#: Merge.rc:860
-#: Merge.rc:870
-#: Merge.rc:1055
-#: Merge.rc:1084
-#: Merge.rc:1094
-#: Merge.rc:1145
-#: Merge.rc:1260
-#: Merge.rc:1337
-#: Merge.rc:1429
-#: Merge.rc:1444
-#: Merge.rc:1666
+#: Merge.rc:708
+#: Merge.rc:738
+#: Merge.rc:800
+#: Merge.rc:830
+#: Merge.rc:862
+#: Merge.rc:872
+#: Merge.rc:1057
+#: Merge.rc:1086
+#: Merge.rc:1096
+#: Merge.rc:1147
+#: Merge.rc:1262
+#: Merge.rc:1339
+#: Merge.rc:1431
+#: Merge.rc:1446
+#: Merge.rc:1668
#, c-format
msgid "Cancel"
msgstr ""
-#: Merge.rc:707
-#: Merge.rc:1338
+#: Merge.rc:709
+#: Merge.rc:1340
#, c-format
msgid "Help"
msgstr ""
-#: Merge.rc:708
+#: Merge.rc:710
#, c-format
msgid "Files or Folders to Compare"
msgstr ""
-#: Merge.rc:715
+#: Merge.rc:717
#, c-format
msgid "Visual SourceSafe"
msgstr ""
-#: Merge.rc:720
+#: Merge.rc:722
#, c-format
msgid "Database:"
msgstr ""
-#: Merge.rc:723
+#: Merge.rc:725
#, c-format
msgid "Project:"
msgstr ""
-#: Merge.rc:726
+#: Merge.rc:728
#, c-format
msgid "User:"
msgstr ""
-#: Merge.rc:728
+#: Merge.rc:730
#, c-format
msgid "Password:"
msgstr ""
-#: Merge.rc:730
+#: Merge.rc:732
#, c-format
msgid "Link to Destination VSS project"
msgstr ""
-#: Merge.rc:732
-#: Merge.rc:875
+#: Merge.rc:734
+#: Merge.rc:877
#, c-format
msgid "Apply to all items"
msgstr ""
-#: Merge.rc:734
+#: Merge.rc:736
#, c-format
msgid "Check Out"
msgstr ""
-#: Merge.rc:735
-#: Merge.rc:871
+#: Merge.rc:737
+#: Merge.rc:873
#, c-format
msgid "Save As..."
msgstr ""
-#: Merge.rc:741
+#: Merge.rc:743
#, c-format
msgid "Versioning System"
msgstr ""
-#: Merge.rc:744
+#: Merge.rc:746
#, c-format
msgid "&Versioning System:"
msgstr ""
-#: Merge.rc:747
-#: Merge.rc:2065
+#: Merge.rc:749
+#: Merge.rc:2067
#, c-format
msgid "&Path to cleartool.exe:"
msgstr ""
-#: Merge.rc:754
-#: Merge.rc:1941
+#: Merge.rc:756
+#: Merge.rc:1943
#, c-format
msgid "General"
msgstr ""
-#: Merge.rc:757
+#: Merge.rc:759
#, c-format
msgid "Automatically &scroll to first difference"
msgstr ""
-#: Merge.rc:760
+#: Merge.rc:762
#, c-format
msgid "&Disable Splash Screen"
msgstr ""
-#: Merge.rc:762
+#: Merge.rc:764
#, c-format
msgid "Cl&ose windows with ESC"
msgstr ""
-#: Merge.rc:764
+#: Merge.rc:766
#, c-format
msgid "&Automatically verify paths in Open-dialog"
msgstr ""
-#: Merge.rc:767
+#: Merge.rc:769
#, c-format
msgid "All&ow only one instance to run"
msgstr ""
-#: Merge.rc:769
+#: Merge.rc:771
#, c-format
msgid "As&k when closing multiple windows"
msgstr ""
-#: Merge.rc:771
+#: Merge.rc:773
#, c-format
msgid "&Preserve file time in file compare"
msgstr ""
-#: Merge.rc:774
+#: Merge.rc:776
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
msgstr ""
-#: Merge.rc:776
+#: Merge.rc:778
#, c-format
msgid "O&pen-dialog Auto-Completion:"
msgstr ""
-#: Merge.rc:779
+#: Merge.rc:781
#, c-format
msgid "Enable multiple compare windows for"
msgstr ""
-#: Merge.rc:781
-#: Merge.rc:1617
+#: Merge.rc:783
+#: Merge.rc:1619
#, c-format
msgid "&Folder compare"
msgstr ""
-#: Merge.rc:783
-#: Merge.rc:1619
+#: Merge.rc:785
+#: Merge.rc:1621
#, c-format
msgid "Fil&e compare"
msgstr ""
-#: Merge.rc:785
+#: Merge.rc:787
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
msgstr ""
-#: Merge.rc:787
+#: Merge.rc:789
#, c-format
msgid "Reset"
msgstr ""
-#: Merge.rc:794
+#: Merge.rc:796
#, c-format
msgid "Language"
msgstr ""
-#: Merge.rc:801
+#: Merge.rc:803
#, c-format
msgid "Available languages:"
msgstr ""
-#: Merge.rc:807
+#: Merge.rc:809
#, c-format
msgid "Find"
msgstr ""
-#: Merge.rc:810
-#: Merge.rc:837
+#: Merge.rc:812
+#: Merge.rc:839
#, c-format
msgid "Fi&nd what:"
msgstr ""
-#: Merge.rc:813
-#: Merge.rc:843
+#: Merge.rc:815
+#: Merge.rc:845
#, c-format
msgid "Match &whole word only"
msgstr ""
-#: Merge.rc:815
-#: Merge.rc:845
+#: Merge.rc:817
+#: Merge.rc:847
#, c-format
msgid "Match &case"
msgstr ""
-#: Merge.rc:817
-#: Merge.rc:847
+#: Merge.rc:819
+#: Merge.rc:849
#, c-format
msgid "Regular &expression"
msgstr ""
-#: Merge.rc:819
+#: Merge.rc:821
#, c-format
msgid "D&on't wrap end of file"
msgstr ""
-#: Merge.rc:822
+#: Merge.rc:824
#, c-format
msgid "Direction"
msgstr ""
-#: Merge.rc:823
+#: Merge.rc:825
#, c-format
msgid "&Up"
msgstr ""
-#: Merge.rc:825
+#: Merge.rc:827
#, c-format
msgid "&Down"
msgstr ""
-#: Merge.rc:827
-#: Merge.rc:857
+#: Merge.rc:829
+#: Merge.rc:859
#, c-format
msgid "&Find Next"
msgstr ""
-#: Merge.rc:834
+#: Merge.rc:836
#, c-format
msgid "Replace"
msgstr ""
-#: Merge.rc:840
+#: Merge.rc:842
#, c-format
msgid "Re&place with:"
msgstr ""
-#: Merge.rc:849
+#: Merge.rc:851
#, c-format
msgid "&Don't wrap end of file"
msgstr ""
-#: Merge.rc:852
+#: Merge.rc:854
#, c-format
msgid "Replace in"
msgstr ""
-#: Merge.rc:853
+#: Merge.rc:855
#, c-format
msgid "&Selection"
msgstr ""
-#: Merge.rc:855
+#: Merge.rc:857
#, c-format
msgid "Wh&ole file"
msgstr ""
-#: Merge.rc:858
+#: Merge.rc:860
#, c-format
msgid "&Replace"
msgstr ""
-#: Merge.rc:859
+#: Merge.rc:861
#, c-format
msgid "Replace &All"
msgstr ""
-#: Merge.rc:866
-#: Merge.rc:2187
+#: Merge.rc:868
+#: Merge.rc:2189
#, c-format
msgid "Rational ClearCase"
msgstr ""
-#: Merge.rc:869
+#: Merge.rc:871
#, c-format
msgid "CheckOut"
msgstr ""
-#: Merge.rc:874
-#: Merge.rc:1179
+#: Merge.rc:876
+#: Merge.rc:1181
#, c-format
msgid "Comments"
msgstr ""
-#: Merge.rc:877
+#: Merge.rc:879
#, c-format
msgid "CheckIn after checkout"
msgstr ""
-#: Merge.rc:883
+#: Merge.rc:885
#, c-format
msgid "Linefilters"
msgstr ""
-#: Merge.rc:886
+#: Merge.rc:888
#, c-format
msgid "Enable Line Filters"
msgstr ""
-#: Merge.rc:889
+#: Merge.rc:891
#, c-format
msgid "Regular Expressions (one per line):"
msgstr ""
-#: Merge.rc:896
+#: Merge.rc:898
#, c-format
msgid "Save"
msgstr ""
-#: Merge.rc:897
+#: Merge.rc:899
#, c-format
msgid "New"
msgstr ""
-#: Merge.rc:898
+#: Merge.rc:900
#, c-format
msgid "Edit"
msgstr ""
-#: Merge.rc:899
+#: Merge.rc:901
#, c-format
msgid "Remove"
msgstr ""
-#: Merge.rc:904
-#: Merge.rc:1944
+#: Merge.rc:906
+#: Merge.rc:1946
#, c-format
msgid "Colors"
msgstr ""
-#: Merge.rc:907
+#: Merge.rc:909
#, c-format
msgid "Difference:"
msgstr ""
-#: Merge.rc:911
+#: Merge.rc:913
#, c-format
msgid "Selected Difference:"
msgstr ""
-#: Merge.rc:915
-#: Merge.rc:1569
+#: Merge.rc:917
+#: Merge.rc:1571
#, c-format
msgid "Background"
msgstr ""
-#: Merge.rc:916
+#: Merge.rc:918
#, c-format
msgid "Deleted"
msgstr ""
-#: Merge.rc:929
-#: Merge.rc:1364
-#: Merge.rc:1570
+#: Merge.rc:931
+#: Merge.rc:1366
+#: Merge.rc:1572
#, c-format
msgid "Text"
msgstr ""
-#: Merge.rc:933
+#: Merge.rc:935
#, c-format
msgid "Ignored Difference:"
msgstr ""
-#: Merge.rc:943
+#: Merge.rc:945
#, c-format
msgid "Moved:"
msgstr ""
-#: Merge.rc:953
+#: Merge.rc:955
#, c-format
msgid "Selected Moved:"
msgstr ""
-#: Merge.rc:960
+#: Merge.rc:962
#, c-format
msgid "Word Difference:"
msgstr ""
-#: Merge.rc:967
+#: Merge.rc:969
#, c-format
msgid "Selected Word Diff:"
msgstr ""
-#: Merge.rc:974
-#: Merge.rc:1053
-#: Merge.rc:1082
-#: Merge.rc:1182
-#: Merge.rc:1410
+#: Merge.rc:976
+#: Merge.rc:1055
+#: Merge.rc:1084
+#: Merge.rc:1184
+#: Merge.rc:1412
#, c-format
msgid "Defaults"
msgstr ""
-#: Merge.rc:980
-#: Merge.rc:1352
-#: Merge.rc:1558
+#: Merge.rc:982
+#: Merge.rc:1354
+#: Merge.rc:1560
#, c-format
msgid "Dialog"
msgstr ""
-#: Merge.rc:990
-#: Merge.rc:1947
+#: Merge.rc:992
+#: Merge.rc:1949
#, c-format
msgid "System"
msgstr ""
-#: Merge.rc:993
+#: Merge.rc:995
#, c-format
msgid "&Send deleted files to Recycle Bin"
msgstr ""
-#: Merge.rc:995
+#: Merge.rc:997
#, c-format
msgid "&External editor:"
msgstr ""
-#: Merge.rc:998
+#: Merge.rc:1000
#, c-format
msgid "&Filter folder:"
msgstr ""
-#: Merge.rc:1000
+#: Merge.rc:1002
#, c-format
msgid "B&rowse..."
msgstr ""
-#: Merge.rc:1001
+#: Merge.rc:1003
#, c-format
msgid "Temporary files folder"
msgstr ""
-#: Merge.rc:1002
+#: Merge.rc:1004
#, c-format
msgid "S&ystem's temp folder"
msgstr ""
-#: Merge.rc:1004
+#: Merge.rc:1006
#, c-format
msgid "C&ustom folder:"
msgstr ""
-#: Merge.rc:1007
-#: Merge.rc:1023
+#: Merge.rc:1009
+#: Merge.rc:1025
#, c-format
msgid "Br&owse..."
msgstr ""
-#: Merge.rc:1013
+#: Merge.rc:1015
#, c-format
msgid "Patch Generator"
msgstr ""
-#: Merge.rc:1016
+#: Merge.rc:1018
#, c-format
msgid "File&1:"
msgstr ""
-#: Merge.rc:1020
+#: Merge.rc:1022
#, c-format
msgid "File&2:"
msgstr ""
-#: Merge.rc:1024
+#: Merge.rc:1026
#, c-format
msgid "&Swap"
msgstr ""
-#: Merge.rc:1025
+#: Merge.rc:1027
#, c-format
msgid "&Append to existing file"
msgstr ""
-#: Merge.rc:1027
+#: Merge.rc:1029
#, c-format
msgid "&Result:"
msgstr ""
-#: Merge.rc:1031
+#: Merge.rc:1033
#, c-format
msgid "&Format"
msgstr ""
-#: Merge.rc:1032
+#: Merge.rc:1034
#, c-format
msgid "St&yle:"
msgstr ""
-#: Merge.rc:1035
+#: Merge.rc:1037
#, c-format
msgid "&Context:"
msgstr ""
-#: Merge.rc:1038
+#: Merge.rc:1040
#, c-format
msgid "W&hitespaces"
msgstr ""
-#: Merge.rc:1039
+#: Merge.rc:1041
#, c-format
msgid "Com&pare"
msgstr ""
-#: Merge.rc:1041
+#: Merge.rc:1043
#, c-format
msgid "I&gnore changes"
msgstr ""
-#: Merge.rc:1043
+#: Merge.rc:1045
#, c-format
msgid "Ig&nore all"
msgstr ""
-#: Merge.rc:1045
+#: Merge.rc:1047
#, c-format
msgid "Ignor&e blank lines"
msgstr ""
-#: Merge.rc:1047
+#: Merge.rc:1049
#, c-format
msgid "Case sensi&tive"
msgstr ""
-#: Merge.rc:1049
+#: Merge.rc:1051
#, c-format
msgid "Inclu&de command line"
msgstr ""
-#: Merge.rc:1051
+#: Merge.rc:1053
#, c-format
msgid "Open to e&xternal editor"
msgstr ""
-#: Merge.rc:1073
+#: Merge.rc:1075
#, c-format
msgid "Display Columns"
msgstr ""
-#: Merge.rc:1079
+#: Merge.rc:1081
#, c-format
msgid "Move &Up"
msgstr ""
-#: Merge.rc:1080
+#: Merge.rc:1082
#, c-format
msgid "Move &Down"
msgstr ""
-#: Merge.rc:1090
+#: Merge.rc:1092
#, c-format
msgid "Select Unpacker"
msgstr ""
-#: Merge.rc:1095
+#: Merge.rc:1097
#, c-format
msgid "File unpacker:"
msgstr ""
-#: Merge.rc:1098
+#: Merge.rc:1100
#, c-format
msgid "Display all unpackers, don't check the extension"
msgstr ""
-#: Merge.rc:1101
+#: Merge.rc:1103
#, c-format
msgid "Extensions list:"
msgstr ""
-#: Merge.rc:1102
+#: Merge.rc:1104
#, c-format
msgid "Description:"
msgstr ""
-#: Merge.rc:1113
+#: Merge.rc:1115
#, c-format
msgid " Folder Compare Progress"
msgstr ""
-#: Merge.rc:1116
-#: Merge.rc:1894
+#: Merge.rc:1118
+#: Merge.rc:1896
#, c-format
msgid "Stop"
msgstr ""
-#: Merge.rc:1121
+#: Merge.rc:1123
#, c-format
msgid "Comparing items..."
msgstr ""
-#: Merge.rc:1122
+#: Merge.rc:1124
#, c-format
msgid "Items compared:"
msgstr ""
-#: Merge.rc:1123
+#: Merge.rc:1125
#, c-format
msgid "Items total:"
msgstr ""
-#: Merge.rc:1129
+#: Merge.rc:1131
#, c-format
msgid "Go To"
msgstr ""
-#: Merge.rc:1132
+#: Merge.rc:1134
#, c-format
msgid "G&oto:"
msgstr ""
-#: Merge.rc:1134
+#: Merge.rc:1136
#, c-format
msgid "File"
msgstr ""
-#: Merge.rc:1139
+#: Merge.rc:1141
#, c-format
msgid "Goto what"
msgstr ""
-#: Merge.rc:1140
+#: Merge.rc:1142
#, c-format
msgid "Li&ne"
msgstr ""
-#: Merge.rc:1142
+#: Merge.rc:1144
#, c-format
msgid "&Difference"
msgstr ""
-#: Merge.rc:1144
+#: Merge.rc:1146
#, c-format
msgid "&Go To"
msgstr ""
-#: Merge.rc:1150
-#: Merge.rc:1942
+#: Merge.rc:1152
+#: Merge.rc:1944
#, c-format
msgid "Compare"
msgstr ""
-#: Merge.rc:1153
+#: Merge.rc:1155
#, c-format
msgid "Whitespace"
msgstr ""
-#: Merge.rc:1154
+#: Merge.rc:1156
#, c-format
msgid "&Compare"
msgstr ""
-#: Merge.rc:1156
+#: Merge.rc:1158
#, c-format
msgid "&Ignore change"
msgstr ""
-#: Merge.rc:1158
+#: Merge.rc:1160
#, c-format
msgid "I&gnore all"
msgstr ""
-#: Merge.rc:1160
+#: Merge.rc:1162
#, c-format
msgid "Ignore blan&k lines"
msgstr ""
-#: Merge.rc:1162
+#: Merge.rc:1164
#, c-format
msgid "Ignore &case"
msgstr ""
-#: Merge.rc:1164
+#: Merge.rc:1166
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgstr ""
-#: Merge.rc:1167
+#: Merge.rc:1169
#, c-format
msgid "E&nable moved block detection"
msgstr ""
-#: Merge.rc:1169
+#: Merge.rc:1171
#, c-format
msgid "&Match similar lines"
msgstr ""
-#: Merge.rc:1171
+#: Merge.rc:1173
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr ""
-#: Merge.rc:1174
+#: Merge.rc:1176
#, c-format
msgid "&File Compare method:"
msgstr ""
-#: Merge.rc:1177
+#: Merge.rc:1179
#, c-format
msgid "S&top after first difference"
msgstr ""
-#: Merge.rc:1180
+#: Merge.rc:1182
#, c-format
msgid "Filter Comments"
msgstr ""
-#: Merge.rc:1187
-#: Merge.rc:1943
+#: Merge.rc:1189
+#: Merge.rc:1945
#, c-format
msgid "Editor"
msgstr ""
-#: Merge.rc:1190
+#: Merge.rc:1192
#, c-format
msgid "&Highlight syntax"
msgstr ""
-#: Merge.rc:1192
+#: Merge.rc:1194
#, c-format
msgid "&Automatic rescan"
msgstr ""
-#: Merge.rc:1194
+#: Merge.rc:1196
#, c-format
msgid "&Preserve original EOL chars"
msgstr ""
-#: Merge.rc:1196
+#: Merge.rc:1198
#, c-format
msgid "Tabs"
msgstr ""
-#: Merge.rc:1197
+#: Merge.rc:1199
#, c-format
msgid "&Tab size:"
msgstr ""
-#: Merge.rc:1200
+#: Merge.rc:1202
#, c-format
msgid "&Insert Tabs"
msgstr ""
-#: Merge.rc:1202
+#: Merge.rc:1204
#, c-format
msgid "Insert &Spaces"
msgstr ""
-#: Merge.rc:1204
+#: Merge.rc:1206
#, c-format
msgid "Line Difference Coloring"
msgstr ""
-#: Merge.rc:1206
+#: Merge.rc:1208
#, c-format
msgid "View line differences"
msgstr ""
-#: Merge.rc:1208
+#: Merge.rc:1210
#, c-format
msgid "&Character level"
msgstr ""
-#: Merge.rc:1210
+#: Merge.rc:1212
#, c-format
msgid "&Word-level:"
msgstr ""
-#: Merge.rc:1225
+#: Merge.rc:1227
#, c-format
msgid "Filefilters"
msgstr ""
-#: Merge.rc:1231
+#: Merge.rc:1233
#, c-format
msgid "Test"
msgstr ""
-#: Merge.rc:1232
+#: Merge.rc:1234
#, c-format
msgid "Install..."
msgstr ""
-#: Merge.rc:1233
+#: Merge.rc:1235
#, c-format
msgid "New..."
msgstr ""
-#: Merge.rc:1234
+#: Merge.rc:1236
#, c-format
msgid "Edit..."
msgstr ""
-#: Merge.rc:1235
+#: Merge.rc:1237
#, c-format
msgid "Delete..."
msgstr ""
-#: Merge.rc:1241
+#: Merge.rc:1243
#, c-format
msgid "Save modified files?"
msgstr ""
-#: Merge.rc:1244
+#: Merge.rc:1246
#, c-format
msgid "Left side file"
msgstr ""
-#: Merge.rc:1247
+#: Merge.rc:1249
#, c-format
msgid "&Save changes"
msgstr ""
-#: Merge.rc:1249
+#: Merge.rc:1251
#, c-format
msgid "&Discard changes"
msgstr ""
-#: Merge.rc:1251
+#: Merge.rc:1253
#, c-format
msgid "Right side file"
msgstr ""
-#: Merge.rc:1254
+#: Merge.rc:1256
#, c-format
msgid "S&ave changes"
msgstr ""
-#: Merge.rc:1256
+#: Merge.rc:1258
#, c-format
msgid "Dis&card changes"
msgstr ""
-#: Merge.rc:1258
+#: Merge.rc:1260
#, c-format
msgid "Discard All"
msgstr ""
-#: Merge.rc:1265
-#: Merge.rc:1513
-#: Merge.rc:1949
+#: Merge.rc:1267
+#: Merge.rc:1515
+#: Merge.rc:1951
#, c-format
msgid "Codepage"
msgstr ""
-#: Merge.rc:1268
+#: Merge.rc:1270
#, c-format
msgid "Default Codepage"
msgstr ""
-#: Merge.rc:1269
+#: Merge.rc:1271
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr ""
-#: Merge.rc:1271
+#: Merge.rc:1273
#, c-format
msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
msgstr ""
-#: Merge.rc:1274
+#: Merge.rc:1276
#, c-format
msgid "System codepage"
msgstr ""
-#: Merge.rc:1276
+#: Merge.rc:1278
#, c-format
msgid "According to WinMerge User Interface"
msgstr ""
-#: Merge.rc:1278
+#: Merge.rc:1280
#, c-format
msgid "Custom codepage:"
msgstr ""
-#: Merge.rc:1286
+#: Merge.rc:1288
#, c-format
msgid "WinMerge - Archive support disabled"
msgstr ""
-#: Merge.rc:1289
+#: Merge.rc:1291
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr ""
-#: Merge.rc:1292
+#: Merge.rc:1294
#, c-format
msgid "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation."
msgstr ""
-#: Merge.rc:1294
+#: Merge.rc:1296
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr ""
-#: Merge.rc:1296
+#: Merge.rc:1298
#, c-format
msgid "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available."
msgstr ""
-#: Merge.rc:1298
+#: Merge.rc:1300
#, c-format
msgid "Version"
msgstr ""
-#: Merge.rc:1300
+#: Merge.rc:1302
#, c-format
msgid "Plugin required\n(dllbuild %04u)"
msgstr ""
-#: Merge.rc:1302
+#: Merge.rc:1304
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr ""
-#: Merge.rc:1305
-#: Merge.rc:1308
+#: Merge.rc:1307
+#: Merge.rc:1310
#, c-format
msgid "present"
msgstr ""
-#: Merge.rc:1306
+#: Merge.rc:1308
#, c-format
msgid "Merge7z000U.dll"
msgstr ""
-#: Merge.rc:1309
+#: Merge.rc:1311
#, c-format
msgid "7-Zip software installed on your computer:"
msgstr ""
-#: Merge.rc:1311
-#: Merge.rc:1316
+#: Merge.rc:1313
+#: Merge.rc:1318
#, c-format
msgid "none"
msgstr ""
-#: Merge.rc:1313
+#: Merge.rc:1315
#, c-format
msgid "missing"
msgstr ""
-#: Merge.rc:1314
+#: Merge.rc:1316
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr ""
-#: Merge.rc:1318
+#: Merge.rc:1320
#, c-format
msgid "outdated"
msgstr ""
-#: Merge.rc:1319
+#: Merge.rc:1321
#, c-format
msgid "Plugins on path:"
msgstr ""
-#: Merge.rc:1320
+#: Merge.rc:1322
#, c-format
msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
msgstr ""
-#: Merge.rc:1324
+#: Merge.rc:1326
#, c-format
msgid "Plugin Download"
msgstr ""
-#: Merge.rc:1333
+#: Merge.rc:1335
#, c-format
msgid "Options"
msgstr ""
-#: Merge.rc:1344
+#: Merge.rc:1346
#, c-format
msgid " Categories"
msgstr ""
-#: Merge.rc:1346
+#: Merge.rc:1348
#, c-format
msgid "Import..."
msgstr ""
-#: Merge.rc:1347
+#: Merge.rc:1349
#, c-format
msgid "Export..."
msgstr ""
-#: Merge.rc:1355
+#: Merge.rc:1357
#, c-format
msgid "Keywords:"
msgstr ""
-#: Merge.rc:1356
+#: Merge.rc:1358
#, c-format
msgid "Function names:"
msgstr ""
-#: Merge.rc:1357
+#: Merge.rc:1359
#, c-format
msgid "Comments:"
msgstr ""
-#: Merge.rc:1358
+#: Merge.rc:1360
#, c-format
msgid "Numbers:"
msgstr ""
-#: Merge.rc:1359
+#: Merge.rc:1361
#, c-format
msgid "Operators:"
msgstr ""
-#: Merge.rc:1360
+#: Merge.rc:1362
#, c-format
msgid "Strings:"
msgstr ""
-#: Merge.rc:1361
+#: Merge.rc:1363
#, c-format
msgid "Preprocessor:"
msgstr ""
-#: Merge.rc:1362
+#: Merge.rc:1364
#, c-format
msgid "User 1:"
msgstr ""
-#: Merge.rc:1363
+#: Merge.rc:1365
#, c-format
msgid "User 2:"
msgstr ""
-#: Merge.rc:1368
-#: Merge.rc:1373
-#: Merge.rc:1378
-#: Merge.rc:1383
-#: Merge.rc:1388
-#: Merge.rc:1393
-#: Merge.rc:1398
-#: Merge.rc:1403
-#: Merge.rc:1408
+#: Merge.rc:1370
+#: Merge.rc:1375
+#: Merge.rc:1380
+#: Merge.rc:1385
+#: Merge.rc:1390
+#: Merge.rc:1395
+#: Merge.rc:1400
+#: Merge.rc:1405
+#: Merge.rc:1410
#, c-format
msgid "Bold"
msgstr ""
-#: Merge.rc:1416
+#: Merge.rc:1418
#, c-format
msgid "Folder Compare Report"
msgstr ""
-#: Merge.rc:1419
+#: Merge.rc:1421
#, c-format
msgid "Report &File:"
msgstr ""
-#: Merge.rc:1422
-#: Merge.rc:1596
-#: Merge.rc:1600
-#: Merge.rc:1627
+#: Merge.rc:1424
+#: Merge.rc:1598
+#: Merge.rc:1602
+#: Merge.rc:1629
#, c-format
msgid "Browse..."
msgstr ""
-#: Merge.rc:1423
+#: Merge.rc:1425
#, c-format
msgid "&Style:"
msgstr ""
-#: Merge.rc:1426
+#: Merge.rc:1428
#, c-format
msgid "&Copy to Clipboard"
msgstr ""
-#: Merge.rc:1434
+#: Merge.rc:1436
#, c-format
msgid "Shared or Private Filter"
msgstr ""
-#: Merge.rc:1437
+#: Merge.rc:1439
#, c-format
msgid "Which type of filter do you want to create?"
msgstr ""
-#: Merge.rc:1439
+#: Merge.rc:1441
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr ""
-#: Merge.rc:1441
+#: Merge.rc:1443
#, c-format
msgid "Private Filter (only for current user)"
msgstr ""
-#: Merge.rc:1449
-#: Merge.rc:1950
+#: Merge.rc:1451
+#: Merge.rc:1952
#, c-format
msgid "Archive Support"
msgstr ""
-#: Merge.rc:1452
+#: Merge.rc:1454
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
msgstr ""
-#: Merge.rc:1454
+#: Merge.rc:1456
#, c-format
msgid "Download 7-zip Plugin"
msgstr ""
-#: Merge.rc:1455
+#: Merge.rc:1457
#, c-format
msgid "&Enable archive file support"
msgstr ""
-#: Merge.rc:1457
+#: Merge.rc:1459
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr ""
-#: Merge.rc:1460
+#: Merge.rc:1462
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr ""
-#: Merge.rc:1462
+#: Merge.rc:1464
#, c-format
msgid "&Detect archive type from file signature"
msgstr ""
-#: Merge.rc:1470
+#: Merge.rc:1472
#, c-format
msgid "Compare Statistics"
msgstr ""
-#: Merge.rc:1473
+#: Merge.rc:1475
#, c-format
msgid "Folders:"
msgstr ""
-#: Merge.rc:1474
+#: Merge.rc:1476
#, c-format
msgid "Files:"
msgstr ""
-#: Merge.rc:1475
-#: Merge.rc:2341
+#: Merge.rc:1477
+#: Merge.rc:2343
#, c-format
msgid "Different"
msgstr ""
-#: Merge.rc:1476
+#: Merge.rc:1478
#, c-format
msgid "Text:"
msgstr ""
-#: Merge.rc:1479
-#: Merge.rc:1498
+#: Merge.rc:1481
+#: Merge.rc:1500
#, c-format
msgid "Binary:"
msgstr ""
-#: Merge.rc:1482
+#: Merge.rc:1484
#, c-format
msgid "Unique"
msgstr ""
-#: Merge.rc:1483
+#: Merge.rc:1485
#, c-format
msgid "Left:"
msgstr ""
-#: Merge.rc:1488
+#: Merge.rc:1490
#, c-format
msgid "Right:"
msgstr ""
-#: Merge.rc:1493
-#: Merge.rc:2335
+#: Merge.rc:1495
+#: Merge.rc:2337
#, c-format
msgid "Identical"
msgstr ""
-#: Merge.rc:1502
+#: Merge.rc:1504
#, c-format
msgid "Total:"
msgstr ""
-#: Merge.rc:1507
+#: Merge.rc:1509
#, c-format
msgid "Close"
msgstr ""
-#: Merge.rc:1516
+#: Merge.rc:1518
#, c-format
msgid "Affects"
msgstr ""
-#: Merge.rc:1519
-#: Merge.rc:1522
+#: Merge.rc:1521
+#: Merge.rc:1524
#, c-format
msgid "(Affects)"
msgstr ""
-#: Merge.rc:1523
+#: Merge.rc:1525
#, c-format
msgid "Select Codepage for"
msgstr ""
-#: Merge.rc:1524
+#: Merge.rc:1526
#, c-format
msgid "&File Loading:"
msgstr ""
-#: Merge.rc:1526
-#: Merge.rc:1529
+#: Merge.rc:1528
+#: Merge.rc:1531
#, c-format
msgid "..."
msgstr ""
-#: Merge.rc:1527
+#: Merge.rc:1529
#, c-format
msgid "File &Saving:"
msgstr ""
-#: Merge.rc:1530
+#: Merge.rc:1532
#, c-format
msgid "&Use same codepage for both"
msgstr ""
-#: Merge.rc:1533
+#: Merge.rc:1535
#, c-format
msgid "&Apply"
msgstr ""
-#: Merge.rc:1534
-#: Merge.rc:1916
+#: Merge.rc:1536
+#: Merge.rc:1918
#, c-format
msgid "&Cancel"
msgstr ""
-#: Merge.rc:1539
+#: Merge.rc:1541
#, c-format
msgid "Test Filter"
msgstr ""
-#: Merge.rc:1542
+#: Merge.rc:1544
#, c-format
msgid "Testing filter ..."
msgstr ""
-#: Merge.rc:1544
+#: Merge.rc:1546
#, c-format
msgid "&Enter text to test:"
msgstr ""
-#: Merge.rc:1546
+#: Merge.rc:1548
#, c-format
msgid "&Folder Name"
msgstr ""
-#: Merge.rc:1548
+#: Merge.rc:1550
#, c-format
msgid "Result:"
msgstr ""
-#: Merge.rc:1552
+#: Merge.rc:1554
#, c-format
msgid "&Test"
msgstr ""
-#: Merge.rc:1553
+#: Merge.rc:1555
#, c-format
msgid "&Close"
msgstr ""
-#: Merge.rc:1561
+#: Merge.rc:1563
#, c-format
msgid "&Use customized text colors"
msgstr ""
-#: Merge.rc:1564
+#: Merge.rc:1566
#, c-format
msgid "Custom text colors"
msgstr ""
-#: Merge.rc:1566
+#: Merge.rc:1568
#, c-format
msgid "Whitespace:"
msgstr ""
-#: Merge.rc:1567
+#: Merge.rc:1569
#, c-format
msgid "Regular text:"
msgstr ""
-#: Merge.rc:1568
+#: Merge.rc:1570
#, c-format
msgid "Selection:"
msgstr ""
-#: Merge.rc:1591
+#: Merge.rc:1593
#, c-format
msgid "Paths"
msgstr ""
-#: Merge.rc:1597
+#: Merge.rc:1599
#, c-format
msgid "R&ead-only"
msgstr ""
-#: Merge.rc:1601
+#: Merge.rc:1603
#, c-format
msgid "Re&ad-only"
msgstr ""
-#: Merge.rc:1607
+#: Merge.rc:1609
#, c-format
msgid "Open..."
msgstr ""
-#: Merge.rc:1608
+#: Merge.rc:1610
#, c-format
msgid "Save..."
msgstr ""
-#: Merge.rc:1613
-#: Merge.rc:1951
+#: Merge.rc:1615
+#: Merge.rc:1953
#, c-format
msgid "Backup Files"
msgstr ""
-#: Merge.rc:1616
+#: Merge.rc:1618
#, c-format
msgid "Create backup files in:"
msgstr ""
-#: Merge.rc:1621
+#: Merge.rc:1623
#, c-format
msgid "Create backup files into:"
msgstr ""
-#: Merge.rc:1622
+#: Merge.rc:1624
#, c-format
msgid "&Original file's folder"
msgstr ""
-#: Merge.rc:1624
+#: Merge.rc:1626
#, c-format
msgid "&Global backup folder:"
msgstr ""
-#: Merge.rc:1628
+#: Merge.rc:1630
#, c-format
msgid "Backup filename:"
msgstr ""
-#: Merge.rc:1629
+#: Merge.rc:1631
#, c-format
msgid "&Append .bak -extension"
msgstr ""
-#: Merge.rc:1631
+#: Merge.rc:1633
#, c-format
msgid "A&ppend timestamp"
msgstr ""
-#: Merge.rc:1638
-#: Merge.rc:2243
+#: Merge.rc:1640
+#: Merge.rc:2245
#, c-format
msgid "Confirm Copy"
msgstr ""
-#: Merge.rc:1642
+#: Merge.rc:1644
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr ""
-#: Merge.rc:1644
+#: Merge.rc:1646
#, c-format
msgid "From left"
msgstr ""
-#: Merge.rc:1647
+#: Merge.rc:1649
#, c-format
msgid "To right"
msgstr ""
-#: Merge.rc:1650
+#: Merge.rc:1652
#, c-format
msgid "Yes"
msgstr ""
-#: Merge.rc:1651
+#: Merge.rc:1653
#, c-format
msgid "No"
msgstr ""
-#: Merge.rc:1657
+#: Merge.rc:1659
#, c-format
msgid "Plugins"
msgstr ""
-#: Merge.rc:1660
+#: Merge.rc:1662
#, c-format
msgid "&Enable plugins"
msgstr ""
-#: Merge.rc:1671
-#: Merge.rc:1952
+#: Merge.rc:1673
+#: Merge.rc:1954
#, c-format
msgid "Shell Integration"
msgstr ""
-#: Merge.rc:1674
+#: Merge.rc:1676
#, c-format
msgid "Explorer"
msgstr ""
-#: Merge.rc:1675
+#: Merge.rc:1677
#, c-format
msgid "E&nable advanced menu"
msgstr ""
-#: Merge.rc:1677
+#: Merge.rc:1679
#, c-format
msgid "In&clude subfolders by default"
msgstr ""
-#: Merge.rc:1679
+#: Merge.rc:1681
#, c-format
msgid "&Add to context menu"
msgstr ""
-#: Merge.rc:1681
+#: Merge.rc:1683
#, c-format
msgid "Folder compare"
msgstr ""
-#: Merge.rc:1682
+#: Merge.rc:1684
#, c-format
msgid "Add &Shell menu to context menu"
msgstr ""
#. StringFileInfo.Block
-#: Merge.rc:1708
+#: Merge.rc:1710
#, c-format
msgid "040904e4"
msgstr ""
#. VarFileInfo.Translation
-#: Merge.rc:1724
+#: Merge.rc:1726
#, c-format
msgid "0x409, 1252"
msgstr ""
-#: Merge.rc:1739
+#: Merge.rc:1741
#, c-format
msgid "Ready"
msgstr ""
-#: Merge.rc:1745
+#: Merge.rc:1747
#, c-format
msgid "EXT"
msgstr ""
-#: Merge.rc:1746
+#: Merge.rc:1748
#, c-format
msgid "CAP"
msgstr ""
-#: Merge.rc:1747
+#: Merge.rc:1749
#, c-format
msgid "NUM"
msgstr ""
-#: Merge.rc:1748
+#: Merge.rc:1750
#, c-format
msgid "SCRL"
msgstr ""
-#: Merge.rc:1749
+#: Merge.rc:1751
#, c-format
msgid "OVR"
msgstr ""
-#: Merge.rc:1750
+#: Merge.rc:1752
#, c-format
msgid "REC"
msgstr ""
-#: Merge.rc:1756
+#: Merge.rc:1758
#, c-format
msgid "Create empty documents\nNew Documents (Ctrl+N)"
msgstr ""
-#: Merge.rc:1757
+#: Merge.rc:1759
#, c-format
msgid "Open an existing document\nOpen (Ctrl+O)"
msgstr ""
-#: Merge.rc:1758
+#: Merge.rc:1760
#, c-format
msgid "Close the active document\nClose"
msgstr ""
-#: Merge.rc:1759
+#: Merge.rc:1761
#, c-format
msgid "Save the active document\nSave (Ctrl+S)"
msgstr ""
-#: Merge.rc:1760
+#: Merge.rc:1762
#, c-format
msgid "Save the active document with a new name\nSave As"
msgstr ""
-#: Merge.rc:1761
+#: Merge.rc:1763
#, c-format
msgid "Change the printing options\nPage Setup"
msgstr ""
-#: Merge.rc:1762
+#: Merge.rc:1764
#, c-format
msgid "Change the printer and printing options\nPrint Setup"
msgstr ""
-#: Merge.rc:1763
+#: Merge.rc:1765
#, c-format
msgid "Print the active document\nPrint"
msgstr ""
-#: Merge.rc:1764
+#: Merge.rc:1766
#, c-format
msgid "Display full pages\nPrint Preview"
msgstr ""
-#: Merge.rc:1769
+#: Merge.rc:1771
#, c-format
msgid "Make all hidden items visible again"
msgstr ""
-#: Merge.rc:1770
+#: Merge.rc:1772
#, c-format
msgid "Toggle tree mode"
msgstr ""
-#: Merge.rc:1771
+#: Merge.rc:1773
#, c-format
msgid "Expand all subfolders"
msgstr ""
-#: Merge.rc:1772
+#: Merge.rc:1774
#, c-format
msgid "Collapse all subfolders"
msgstr ""
-#: Merge.rc:1778
+#: Merge.rc:1780
#, c-format
msgid "Open project file\nProject file (Ctrl+J)"
msgstr ""
-#: Merge.rc:1779
+#: Merge.rc:1781
#, c-format
msgid "Unknown error attempting to open project file"
msgstr ""
-#: Merge.rc:1780
+#: Merge.rc:1782
#, c-format
msgid "Unknown error attempting to save project file"
msgstr ""
-#: Merge.rc:1781
+#: Merge.rc:1783
#, c-format
msgid "Project File"
msgstr ""
-#: Merge.rc:1782
+#: Merge.rc:1784
#, c-format
msgid "Project file successfully loaded."
msgstr ""
-#: Merge.rc:1783
+#: Merge.rc:1785
#, c-format
msgid "Project file successfully saved."
msgstr ""
-#: Merge.rc:1784
+#: Merge.rc:1786
#, c-format
msgid "Save current paths and options to project file\nSave Project File"
msgstr ""
-#: Merge.rc:1789
+#: Merge.rc:1791
#, c-format
msgid "Display program information, version number and copyright\nAbout"
msgstr ""
-#: Merge.rc:1790
+#: Merge.rc:1792
#, c-format
msgid "Quit the application; prompts to save documents\nExit"
msgstr ""
-#: Merge.rc:1796
-#: Merge.rc:1797
#: Merge.rc:1798
#: Merge.rc:1799
#: Merge.rc:1800
@@ -2778,2859 +2776,2861 @@
#: Merge.rc:1809
#: Merge.rc:1810
#: Merge.rc:1811
+#: Merge.rc:1812
+#: Merge.rc:1813
#, c-format
msgid "Open this document"
msgstr ""
-#: Merge.rc:1816
+#: Merge.rc:1818
#, c-format
msgid "Switch to the next window pane\nNext Pane"
msgstr ""
-#: Merge.rc:1817
+#: Merge.rc:1819
#, c-format
msgid "Switch back to the previous window pane\nPrevious Pane"
msgstr ""
-#: Merge.rc:1823
+#: Merge.rc:1825
#, c-format
msgid "Arrange windows so they overlap\nCascade Windows"
msgstr ""
-#: Merge.rc:1824
+#: Merge.rc:1826
#, c-format
msgid "Arrange windows as non-overlapping tiles horizontally\nTile Windows Horizontally"
msgstr ""
-#: Merge.rc:1825
+#: Merge.rc:1827
#, c-format
msgid "Arrange windows as non-overlapping tiles vertically\nTile Windows Vertically"
msgstr ""
-#: Merge.rc:1831
+#: Merge.rc:1833
#, c-format
msgid "Copy the selection and put it on the Clipboard\nCopy"
msgstr ""
-#: Merge.rc:1832
+#: Merge.rc:1834
#, c-format
msgid "Cut the selection and put it on the Clipboard\nCut"
msgstr ""
-#: Merge.rc:1833
+#: Merge.rc:1835
#, c-format
msgid "Find the specified text\nFind"
msgstr ""
-#: Merge.rc:1834
+#: Merge.rc:1836
#, c-format
msgid "Insert Clipboard contents\nPaste"
msgstr ""
-#: Merge.rc:1835
+#: Merge.rc:1837
#, c-format
msgid "Repeat the last action\nRepeat"
msgstr ""
-#: Merge.rc:1836
+#: Merge.rc:1838
#, c-format
msgid "Replace specific text with different text\nReplace"
msgstr ""
-#: Merge.rc:1837
+#: Merge.rc:1839
#, c-format
msgid "Select the entire document\nSelect All"
msgstr ""
-#: Merge.rc:1838
+#: Merge.rc:1840
#, c-format
msgid "Undo the last action\nUndo (Ctrl+Z)"
msgstr ""
-#: Merge.rc:1839
+#: Merge.rc:1841
#, c-format
msgid "Redo the previously undone action\nRedo (Ctrl+Y)"
msgstr ""
-#: Merge.rc:1845
+#: Merge.rc:1847
#, c-format
msgid "Show or hide the toolbar\nToggle ToolBar"
msgstr ""
-#: Merge.rc:1846
+#: Merge.rc:1848
#, c-format
msgid "Show or hide the status bar\nToggle StatusBar"
msgstr ""
-#: Merge.rc:1847
+#: Merge.rc:1849
#, c-format
msgid "Show or hide the tab bar\nToggle TabBar"
msgstr ""
-#: Merge.rc:1848
+#: Merge.rc:1850
#, c-format
msgid "Automatically resize panes\nLock Panes"
msgstr ""
-#: Merge.rc:1854
+#: Merge.rc:1856
#, c-format
msgid "Change the window size"
msgstr ""
-#: Merge.rc:1855
+#: Merge.rc:1857
#, c-format
msgid "Change the window position"
msgstr ""
-#: Merge.rc:1856
+#: Merge.rc:1858
#, c-format
msgid "Reduce the window to an icon"
msgstr ""
-#: Merge.rc:1857
+#: Merge.rc:1859
#, c-format
msgid "Enlarge the window to full size"
msgstr ""
-#: Merge.rc:1858
+#: Merge.rc:1860
#, c-format
msgid "Switch to the next document window"
msgstr ""
-#: Merge.rc:1859
+#: Merge.rc:1861
#, c-format
msgid "Switch to the previous document window"
msgstr ""
-#: Merge.rc:1860
+#: Merge.rc:1862
#, c-format
msgid "Close the active window and prompts to save the documents"
msgstr ""
-#: Merge.rc:1865
+#: Merge.rc:1867
#, c-format
msgid "Restore the window to normal size"
msgstr ""
-#: Merge.rc:1866
+#: Merge.rc:1868
#, c-format
msgid "Activate Task List"
msgstr ""
-#: Merge.rc:1867
+#: Merge.rc:1869
#, c-format
msgid "Activate this window"
msgstr ""
-#: Merge.rc:1873
+#: Merge.rc:1875
#, c-format
msgid "Close print preview mode\nCancel Preview"
msgstr ""
-#: Merge.rc:1880
+#: Merge.rc:1882
#, c-format
msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
msgstr ""
-#: Merge.rc:1881
+#: Merge.rc:1883
#, c-format
msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
msgstr ""
-#: Merge.rc:1888
+#: Merge.rc:1890
#, c-format
msgid "Preserve original EOL chars"
msgstr ""
-#: Merge.rc:1895
+#: Merge.rc:1897
#, c-format
msgid "Press any key"
msgstr ""
-#: Merge.rc:1901
-#: Merge.rc:1902
+#: Merge.rc:1903
+#: Merge.rc:1904
#, c-format
msgid "Right click on the path to copy"
msgstr ""
-#: Merge.rc:1908
+#: Merge.rc:1910
#, c-format
msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
msgstr ""
-#: Merge.rc:1909
+#: Merge.rc:1911
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
msgstr ""
-#: Merge.rc:1915
+#: Merge.rc:1917
#, c-format
msgid "&Ok"
msgstr ""
-#: Merge.rc:1917
+#: Merge.rc:1919
#, c-format
msgid "&Abort"
msgstr ""
-#: Merge.rc:1918
+#: Merge.rc:1920
#, c-format
msgid "&Retry"
msgstr ""
-#: Merge.rc:1919
+#: Merge.rc:1921
#, c-format
msgid "&Ignore"
msgstr ""
-#: Merge.rc:1920
+#: Merge.rc:1922
#, c-format
msgid "Ignore &all"
msgstr ""
-#: Merge.rc:1921
+#: Merge.rc:1923
#, c-format
msgid "&Yes"
msgstr ""
-#: Merge.rc:1927
+#: Merge.rc:1929
#, c-format
msgid "Yes to &all"
msgstr ""
-#: Merge.rc:1928
+#: Merge.rc:1930
#, c-format
msgid "&No"
msgstr ""
-#: Merge.rc:1929
+#: Merge.rc:1931
#, c-format
msgid "No to a&ll"
msgstr ""
-#: Merge.rc:1930
+#: Merge.rc:1932
#, c-format
msgid "&Continue"
msgstr ""
-#: Merge.rc:1931
+#: Merge.rc:1933
#, c-format
msgid "&Skip"
msgstr ""
-#: Merge.rc:1932
+#: Merge.rc:1934
#, c-format
msgid "Skip &all"
msgstr ""
-#: Merge.rc:1934
+#: Merge.rc:1936
#, c-format
msgid "Don't display this &message again."
msgstr ""
-#: Merge.rc:1935
+#: Merge.rc:1937
#, c-format
msgid "Don't ask this &question again."
msgstr ""
-#: Merge.rc:1945
+#: Merge.rc:1947
#, c-format
msgid "Syntax colors"
msgstr ""
-#: Merge.rc:1946
+#: Merge.rc:1948
#, c-format
msgid "Text Colors"
msgstr ""
-#: Merge.rc:1948
+#: Merge.rc:1950
#, c-format
msgid "Version Control"
msgstr ""
-#: Merge.rc:1959
+#: Merge.rc:1961
#, c-format
msgid "To:"
msgstr ""
-#: Merge.rc:1960
+#: Merge.rc:1962
#, c-format
msgid "From left:"
msgstr ""
-#: Merge.rc:1961
+#: Merge.rc:1963
#, c-format
msgid "To left:"
msgstr ""
-#: Merge.rc:1962
+#: Merge.rc:1964
#, c-format
msgid "From right:"
msgstr ""
-#: Merge.rc:1963
+#: Merge.rc:1965
#, c-format
msgid "To right:"
msgstr ""
-#: Merge.rc:1969
+#: Merge.rc:1971
#, c-format
msgid "Version %1"
msgstr ""
-#: Merge.rc:1970
+#: Merge.rc:1972
#, c-format
msgid "Unicode"
msgstr ""
-#: Merge.rc:1971
+#: Merge.rc:1973
#, c-format
msgid "X64"
msgstr ""
-#: Merge.rc:1977
+#: Merge.rc:1979
#, c-format
msgid "Options (%1)"
msgstr ""
-#: Merge.rc:1978
+#: Merge.rc:1980
#, c-format
msgid "All message boxes are now displayed again."
msgstr ""
-#: Merge.rc:1979
+#: Merge.rc:1981
#, c-format
msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted."
msgstr ""
-#: Merge.rc:1980
+#: Merge.rc:1982
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
msgstr ""
-#: Merge.rc:1982
+#: Merge.rc:1984
#, c-format
msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
msgstr ""
-#: Merge.rc:1984
+#: Merge.rc:1986
#, c-format
msgid "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset."
msgstr ""
-#: Merge.rc:1990
+#: Merge.rc:1992
#, c-format
msgid "Open"
msgstr ""
-#: Merge.rc:1991
+#: Merge.rc:1993
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1992
+#: Merge.rc:1994
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:1993
+#: Merge.rc:1995
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr ""
-#: Merge.rc:1995
+#: Merge.rc:1997
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:2001
+#: Merge.rc:2003
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:2002
+#: Merge.rc:2004
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:2003
+#: Merge.rc:2005
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:2009
+#: Merge.rc:2011
#, c-format
msgid "UTF-8"
msgstr ""
-#: Merge.rc:2010
+#: Merge.rc:2012
#, c-format
msgid "UTF-8 (B)"
msgstr ""
-#: Merge.rc:2011
+#: Merge.rc:2013
#, c-format
msgid "UCS-2 LE"
msgstr ""
-#: Merge.rc:2012
+#: Merge.rc:2014
#, c-format
msgid "UCS-2 BE"
msgstr ""
-#: Merge.rc:2018
+#: Merge.rc:2020
#, c-format
msgid "Full Contents"
msgstr ""
-#: Merge.rc:2019
+#: Merge.rc:2021
#, c-format
msgid "Quick Contents"
msgstr ""
-#: Merge.rc:2020
+#: Merge.rc:2022
#, c-format
msgid "Modified Date"
msgstr ""
-#: Merge.rc:2021
+#: Merge.rc:2023
#, c-format
msgid "Modified Date and Size"
msgstr ""
-#: Merge.rc:2022
+#: Merge.rc:2024
#, c-format
msgid "Size"
msgstr ""
-#: Merge.rc:2028
-#: Merge.rc:2653
+#: Merge.rc:2030
+#: Merge.rc:2655
#, c-format
msgid "Name"
msgstr ""
-#: Merge.rc:2029
+#: Merge.rc:2031
#, c-format
msgid "Location"
msgstr ""
-#: Merge.rc:2030
+#: Merge.rc:2032
#, c-format
msgid "Filters"
msgstr ""
-#: Merge.rc:2031
+#: Merge.rc:2033
#, c-format
msgid "[F] "
msgstr ""
-#: Merge.rc:2032
-#: Merge.rc:2655
+#: Merge.rc:2034
+#: Merge.rc:2657
#, c-format
msgid "Description"
msgstr ""
-#: Merge.rc:2033
+#: Merge.rc:2035
#, c-format
msgid "Select filename for new filter"
msgstr ""
-#: Merge.rc:2034
+#: Merge.rc:2036
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr ""
-#: Merge.rc:2036
+#: Merge.rc:2038
#, c-format
msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2."
msgstr ""
-#: Merge.rc:2038
+#: Merge.rc:2040
#, c-format
msgid "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable."
msgstr ""
-#: Merge.rc:2040
+#: Merge.rc:2042
#, c-format
msgid "User's filter file folder is not defined!\n\nPlease select filter folder in Options/System."
msgstr ""
-#: Merge.rc:2042
+#: Merge.rc:2044
#, c-format
msgid "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?"
msgstr ""
-#: Merge.rc:2043
+#: Merge.rc:2045
#, c-format
msgid "Locate filter file to install"
msgstr ""
-#: Merge.rc:2045
+#: Merge.rc:2047
#, c-format
msgid "Installing filter file failed.\n\nCould not copy new filter file to filter folder."
msgstr ""
-#: Merge.rc:2047
+#: Merge.rc:2049
#, c-format
msgid "Filter file already exists. Overwrite existing filter?"
msgstr ""
-#: Merge.rc:2053
+#: Merge.rc:2055
#, c-format
msgid "Regular expression"
msgstr ""
-#: Merge.rc:2059
+#: Merge.rc:2061
#, c-format
msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
msgstr ""
-#: Merge.rc:2066
+#: Merge.rc:2068
#, c-format
msgid "&Path to SS.EXE:"
msgstr ""
-#: Merge.rc:2072
+#: Merge.rc:2074
#, c-format
msgid "Folder Comparison Results"
msgstr ""
-#: Merge.rc:2073
+#: Merge.rc:2075
#, c-format
msgid "File Comparison"
msgstr ""
-#: Merge.rc:2074
+#: Merge.rc:2076
#, c-format
msgid "Untitled left"
msgstr ""
-#: Merge.rc:2075
+#: Merge.rc:2077
#, c-format
msgid "Untitled right"
msgstr ""
-#: Merge.rc:2076
+#: Merge.rc:2078
#, c-format
msgid "Theirs File"
msgstr ""
-#: Merge.rc:2077
+#: Merge.rc:2079
#, c-format
msgid "Mine File"
msgstr ""
-#: Merge.rc:2083
+#: Merge.rc:2085
#, c-format
msgid "Scanning files..."
msgstr ""
-#: Merge.rc:2084
+#: Merge.rc:2086
#, c-format
msgid "Opening selection"
msgstr ""
-#: Merge.rc:2085
+#: Merge.rc:2087
#, c-format
msgid "Copying Left to Right"
msgstr ""
-#: Merge.rc:2086
+#: Merge.rc:2088
#, c-format
msgid "Copying Right to Left"
msgstr ""
-#: Merge.rc:2087
+#: Merge.rc:2089
#, c-format
msgid "Copying All to Left"
msgstr ""
-#: Merge.rc:2088
+#: Merge.rc:2090
#, c-format
msgid "Copying All to Right"
msgstr ""
-#: Merge.rc:2089
+#: Merge.rc:2091
#, c-format
msgid "Copying files..."
msgstr ""
-#: Merge.rc:2090
+#: Merge.rc:2092
#, c-format
msgid "Deleting files..."
msgstr ""
-#: Merge.rc:2091
+#: Merge.rc:2093
#, c-format
msgid "Moving files..."
msgstr ""
-#: Merge.rc:2092
+#: Merge.rc:2094
#, c-format
msgid "Creating the report..."
msgstr ""
-#: Merge.rc:2093
+#: Merge.rc:2095
#, c-format
msgid "Undoing the last operation..."
msgstr ""
-#: Merge.rc:2094
+#: Merge.rc:2096
#, c-format
msgid "Redoing the previous operation..."
msgstr ""
-#: Merge.rc:2100
+#: Merge.rc:2102
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr ""
-#: Merge.rc:2101
+#: Merge.rc:2103
#, c-format
msgid "Line: %s"
msgstr ""
-#: Merge.rc:2102
+#: Merge.rc:2104
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr ""
-#: Merge.rc:2103
+#: Merge.rc:2105
#, c-format
msgid "Merge"
msgstr ""
-#: Merge.rc:2104
+#: Merge.rc:2106
#, c-format
msgid "Difference %1 of %2"
msgstr ""
-#: Merge.rc:2105
+#: Merge.rc:2107
#, c-format
msgid "%1 Differences Found"
msgstr ""
-#: Merge.rc:2106
+#: Merge.rc:2108
#, c-format
msgid "1 Difference Found"
msgstr ""
#. Abbreviation from "Read Only"
-#: Merge.rc:2107
+#: Merge.rc:2109
#, c-format
msgid "RO"
msgstr ""
-#: Merge.rc:2113
+#: Merge.rc:2115
#, c-format
msgid "Item %1 of %2"
msgstr ""
-#: Merge.rc:2114
+#: Merge.rc:2116
#, c-format
msgid "Items: %1"
msgstr ""
-#: Merge.rc:2120
+#: Merge.rc:2122
#, c-format
msgid "Select two existing folders or files to compare"
msgstr ""
-#: Merge.rc:2121
+#: Merge.rc:2123
#, c-format
msgid "Folder Selection"
msgstr ""
-#: Merge.rc:2122
+#: Merge.rc:2124
#, c-format
msgid "Select two folders or two files to compare."
msgstr ""
-#: Merge.rc:2123
+#: Merge.rc:2125
#, c-format
msgid "Left path is invalid!"
msgstr ""
-#: Merge.rc:2124
+#: Merge.rc:2126
#, c-format
msgid "Right path is invalid!"
msgstr ""
-#: Merge.rc:2125
+#: Merge.rc:2127
#, c-format
msgid "Both paths are invalid!"
msgstr ""
-#: Merge.rc:2126
+#: Merge.rc:2128
#, c-format
msgid "Choose two files to enable unpacker selection."
msgstr ""
-#: Merge.rc:2127
+#: Merge.rc:2129
#, c-format
msgid "Cannot compare file and folder!"
msgstr ""
-#: Merge.rc:2133
+#: Merge.rc:2135
#, c-format
msgid "File not found: %1"
msgstr ""
-#: Merge.rc:2134
+#: Merge.rc:2136
#, c-format
msgid "File not unpacked: %1"
msgstr ""
-#: Merge.rc:2135
+#: Merge.rc:2137
#, c-format
msgid "Cannot open file\n%1\n\n%2"
msgstr ""
-#: Merge.rc:2136
+#: Merge.rc:2138
#, c-format
msgid "Failed to parse conflict file."
msgstr ""
-#: Merge.rc:2137
+#: Merge.rc:2139
#, c-format
msgid "The file\n%1\nis not a conflict file."
msgstr ""
-#: Merge.rc:2143
+#: Merge.rc:2145
#, c-format
msgid "Save As"
msgstr ""
-#: Merge.rc:2144
+#: Merge.rc:2146
#, c-format
msgid "Save changes to %1?"
msgstr ""
-#: Merge.rc:2145
+#: Merge.rc:2147
#, c-format
msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
msgstr ""
-#: Merge.rc:2146
+#: Merge.rc:2148
#, c-format
msgid "Error checking destination writeability"
msgstr ""
-#: Merge.rc:2147
+#: Merge.rc:2149
#, c-format
msgid "Error backing up file"
msgstr ""
-#: Merge.rc:2149
+#: Merge.rc:2151
#, c-format
msgid "Unable to backup original file:\n%1\n\nContinue anyway?"
msgstr ""
-#: Merge.rc:2150
+#: Merge.rc:2152
#, c-format
msgid "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"
msgstr ""
-#: Merge.rc:2151
+#: Merge.rc:2153
#, c-format
msgid "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
msgstr ""
-#: Merge.rc:2152
+#: Merge.rc:2154
#, c-format
msgid "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
msgstr ""
-#: Merge.rc:2153
+#: Merge.rc:2155
#, c-format
msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?"
msgstr ""
-#: Merge.rc:2154
+#: Merge.rc:2156
#, c-format
msgid "%1\nis marked read-only. Would you like to override the read-only item?"
msgstr ""
-#: Merge.rc:2155
+#: Merge.rc:2157
#, c-format
msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
msgstr ""
-#: Merge.rc:2156
+#: Merge.rc:2158
#, c-format
msgid "Save Left File As"
msgstr ""
-#: Merge.rc:2157
+#: Merge.rc:2159
#, c-format
msgid "Save Right File As"
msgstr ""
-#: Merge.rc:2158
+#: Merge.rc:2160
#, c-format
msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
msgstr ""
-#: Merge.rc:2164
+#: Merge.rc:2166
#, c-format
msgid "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing."
msgstr ""
-#: Merge.rc:2170
+#: Merge.rc:2172
#, c-format
msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
msgstr ""
-#: Merge.rc:2171
+#: Merge.rc:2173
#, c-format
msgid "Checkout files from VSS..."
msgstr ""
-#: Merge.rc:2172
+#: Merge.rc:2174
#, c-format
msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
msgstr ""
-#: Merge.rc:2173
+#: Merge.rc:2175
#, c-format
msgid "Error executing versioning system command."
msgstr ""
-#: Merge.rc:2174
+#: Merge.rc:2176
#, c-format
msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
msgstr ""
-#: Merge.rc:2175
+#: Merge.rc:2177
#, c-format
msgid "No VSS database(s) found!"
msgstr ""
-#: Merge.rc:2176
+#: Merge.rc:2178
#, c-format
msgid "Error from VSS:"
msgstr ""
-#: Merge.rc:2177
+#: Merge.rc:2179
#, c-format
msgid "Versioning System returned an error while attempting to check in the file.\n Please, check config spec of used view.\n Undo checkout operation?"
msgstr ""
-#: Merge.rc:2178
+#: Merge.rc:2180
#, c-format
msgid "Versioning System returned an error while attempting to undo checkout the file.\n Please, check config spec of used view. "
msgstr ""
-#: Merge.rc:2184
-#: Merge.rc:2637
+#: Merge.rc:2186
+#: Merge.rc:2639
#, c-format
msgid "None"
msgstr ""
-#: Merge.rc:2185
+#: Merge.rc:2187
#, c-format
msgid "Visual SourceSafe (less than 5.0)"
msgstr ""
-#: Merge.rc:2186
+#: Merge.rc:2188
#, c-format
msgid "Visual SourceSafe (5.0 and above)"
msgstr ""
-#: Merge.rc:2188
+#: Merge.rc:2190
#, c-format
msgid "Break at whitespace"
msgstr ""
-#: Merge.rc:2189
+#: Merge.rc:2191
#, c-format
msgid "Break at whitespace or punctuation"
msgstr ""
-#: Merge.rc:2195
#: Merge.rc:2197
+#: Merge.rc:2199
#, c-format
msgid "Copy selected item to named directory"
msgstr ""
-#: Merge.rc:2196
#: Merge.rc:2198
+#: Merge.rc:2200
#, c-format
msgid "Copy selected item to custom directory"
msgstr ""
-#: Merge.rc:2199
+#: Merge.rc:2201
#, c-format
msgid "Delete selected item on left"
msgstr ""
-#: Merge.rc:2200
+#: Merge.rc:2202
#, c-format
msgid "Delete selected item on right"
msgstr ""
-#: Merge.rc:2201
+#: Merge.rc:2203
#, c-format
msgid "Delete selected item(s) on both sides"
msgstr ""
-#: Merge.rc:2202
+#: Merge.rc:2204
#, c-format
msgid "Hide selected item(s) (on the fly filter)"
msgstr ""
-#: Merge.rc:2203
+#: Merge.rc:2205
#, c-format
msgid "Rename selected item on both sides"
msgstr ""
-#: Merge.rc:2204
+#: Merge.rc:2206
#, c-format
msgid "Right to Left (%1)"
msgstr ""
-#: Merge.rc:2205
+#: Merge.rc:2207
#, c-format
msgid "Left to Right (%1)"
msgstr ""
-#: Merge.rc:2206
+#: Merge.rc:2208
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr ""
-#: Merge.rc:2207
+#: Merge.rc:2209
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr ""
-#: Merge.rc:2208
-#: Merge.rc:2224
+#: Merge.rc:2210
+#: Merge.rc:2226
#, c-format
msgid "Left to... (%1)"
msgstr ""
-#: Merge.rc:2209
-#: Merge.rc:2225
+#: Merge.rc:2211
+#: Merge.rc:2227
#, c-format
msgid "Right to... (%1)"
msgstr ""
-#: Merge.rc:2210
-#: Merge.rc:2226
+#: Merge.rc:2212
+#: Merge.rc:2228
#, c-format
msgid "Left to... (%1 of %2)"
msgstr ""
-#: Merge.rc:2211
-#: Merge.rc:2227
+#: Merge.rc:2213
+#: Merge.rc:2229
#, c-format
msgid "Right to... (%1 of %2)"
msgstr ""
-#: Merge.rc:2217
+#: Merge.rc:2219
#, c-format
msgid "Left (%1)"
msgstr ""
-#: Merge.rc:2218
+#: Merge.rc:2220
#, c-format
msgid "Right (%1)"
msgstr ""
-#: Merge.rc:2219
+#: Merge.rc:2221
#, c-format
msgid "Both (%1)"
msgstr ""
-#: Merge.rc:2220
+#: Merge.rc:2222
#, c-format
msgid "Left (%1 of %2)"
msgstr ""
-#: Merge.rc:2221
+#: Merge.rc:2223
#, c-format
msgid "Right (%1 of %2)"
msgstr ""
-#: Merge.rc:2222
+#: Merge.rc:2224
#, c-format
msgid "Both (%1 of %2)"
msgstr ""
-#: Merge.rc:2223
+#: Merge.rc:2225
#, c-format
msgid "Select destination folder"
msgstr ""
-#: Merge.rc:2228
+#: Merge.rc:2230
#, c-format
msgid "Left side - select destination folder:"
msgstr ""
-#: Merge.rc:2229
+#: Merge.rc:2231
#, c-format
msgid "Right side - select destination folder:"
msgstr ""
-#: Merge.rc:2230
+#: Merge.rc:2232
#, c-format
msgid "(%1 Files Affected)"
msgstr ""
-#: Merge.rc:2231
+#: Merge.rc:2233
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr ""
-#: Merge.rc:2237
+#: Merge.rc:2239
#, c-format
msgid "Are you sure you want to delete\n\n%1 ?"
msgstr ""
-#: Merge.rc:2238
+#: Merge.rc:2240
#, c-format
msgid "Are you sure you want to copy:"
msgstr ""
-#: Merge.rc:2239
+#: Merge.rc:2241
#, c-format
msgid "Are you sure you want to copy %d items:"
msgstr ""
-#: Merge.rc:2240
+#: Merge.rc:2242
#, c-format
msgid "Operation aborted!\n\nFolder contents at disks has changed, path\n%1\nwas not found.\n\nPlease refresh the compare."
msgstr ""
-#: Merge.rc:2241
+#: Merge.rc:2243
#, c-format
msgid "Are you sure you want to move:"
msgstr ""
-#: Merge.rc:2242
+#: Merge.rc:2244
#, c-format
msgid "Are you sure you want to move %d items:"
msgstr ""
-#: Merge.rc:2244
+#: Merge.rc:2246
#, c-format
msgid "Confirm Move"
msgstr ""
-#: Merge.rc:2250
+#: Merge.rc:2252
#, c-format
msgid "Open left file"
msgstr ""
-#: Merge.rc:2251
+#: Merge.rc:2253
#, c-format
msgid "Open the left file to external editor"
msgstr ""
-#: Merge.rc:2252
+#: Merge.rc:2254
#, c-format
msgid "Open left file with ..."
msgstr ""
-#: Merge.rc:2253
+#: Merge.rc:2255
#, c-format
msgid "Open right file"
msgstr ""
-#: Merge.rc:2254
+#: Merge.rc:2256
#, c-format
msgid "Open the right file to external editor"
msgstr ""
-#: Merge.rc:2255
+#: Merge.rc:2257
#, c-format
msgid "Open right file with..."
msgstr ""
-#: Merge.rc:2256
+#: Merge.rc:2258
#, c-format
msgid "Failed to execute external editor: %1"
msgstr ""
-#: Merge.rc:2257
+#: Merge.rc:2259
#, c-format
msgid "Unknown extension on external editor: %1"
msgstr ""
-#: Merge.rc:2258
+#: Merge.rc:2260
#, c-format
msgid "Copy filenames to clipboard"
msgstr ""
-#: Merge.rc:2259
+#: Merge.rc:2261
#, c-format
ms...
[truncated message content] |
|
From: <ki...@us...> - 2010-10-19 17:25:15
|
Revision: 7316
http://winmerge.svn.sourceforge.net/winmerge/?rev=7316&view=rev
Author: kimmov
Date: 2010-10-19 17:25:09 +0000 (Tue, 19 Oct 2010)
Log Message:
-----------
PATCH: [ 2600787 ] Remove copy to left at context menu
Submitted by Dmitry Maslov
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/Src/MergeEditView.cpp
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-18 13:52:00 UTC (rev 7315)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-19 17:25:09 UTC (rev 7316)
@@ -7,6 +7,8 @@
Add missing keywords to Pascal highlighter (#2834192)
Recognize .ascx files as ASP files (#3042393)
Fix help locations (#2988974)
+ Show only "Copy to other side" item in file compare
+ context menu (#2600787)
New translation: Persian (#2877121, #3065119)
New translation: Serbian (#3017674, #3065119)
Installer: Drop Windows 9x/ME/NT4 support and use Microsoft runtime
Modified: branches/R2_14/Src/MergeEditView.cpp
===================================================================
--- branches/R2_14/Src/MergeEditView.cpp 2010-10-18 13:52:00 UTC (rev 7315)
+++ branches/R2_14/Src/MergeEditView.cpp 2010-10-19 17:25:09 UTC (rev 7316)
@@ -2041,6 +2041,13 @@
// Create the menu and populate it with the available functions
BCMenu menu;
VERIFY(menu.LoadMenu(IDR_POPUP_MERGEVIEW));
+
+ // Remove copying item copying from active side
+ if (m_nThisPane == 0) // left?
+ menu.RemoveMenu(ID_R2L, MF_BYCOMMAND);
+ else
+ menu.RemoveMenu(ID_L2R, MF_BYCOMMAND);
+
VERIFY(menu.LoadToolbar(IDR_MAINFRAME));
theApp.TranslateMenu(menu.m_hMenu);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-18 13:52:08
|
Revision: 7315
http://winmerge.svn.sourceforge.net/winmerge/?rev=7315&view=rev
Author: gerundt
Date: 2010-10-18 13:52:00 +0000 (Mon, 18 Oct 2010)
Log Message:
-----------
Fix whitespace in DirView.[cpp|h] from R2_14
Modified Paths:
--------------
branches/R2_14/Src/DirView.cpp
branches/R2_14/Src/DirView.h
Modified: branches/R2_14/Src/DirView.cpp
===================================================================
--- branches/R2_14/Src/DirView.cpp 2010-10-18 09:16:32 UTC (rev 7314)
+++ branches/R2_14/Src/DirView.cpp 2010-10-18 13:52:00 UTC (rev 7315)
@@ -108,21 +108,21 @@
/////////////////////////////////////////////////////////////////////////////
// CDirView
-enum { COLUMN_REORDER=99 };
+enum { COLUMN_REORDER = 99 };
IMPLEMENT_DYNCREATE(CDirView, CListView)
CDirView::CDirView()
-: m_numcols(-1)
-, m_dispcols(-1)
-, m_pList(NULL)
-, m_nHiddenItems(0)
-, m_pCmpProgressDlg(NULL)
-, m_compareStart(0)
-, m_bTreeMode(false)
-, m_pShellContextMenuLeft(NULL)
-, m_pShellContextMenuRight(NULL)
-, m_hCurrentMenu(NULL)
+ : m_numcols(-1)
+ , m_dispcols(-1)
+ , m_pList(NULL)
+ , m_nHiddenItems(0)
+ , m_pCmpProgressDlg(NULL)
+ , m_compareStart(0)
+ , m_bTreeMode(false)
+ , m_pShellContextMenuLeft(NULL)
+ , m_pShellContextMenuRight(NULL)
+ , m_hCurrentMenu(NULL)
{
m_dwDefaultStyle &= ~LVS_TYPEMASK;
// Show selection all the time, so user can see current item even when
@@ -255,7 +255,7 @@
ON_NOTIFY_REFLECT(LVN_ITEMCHANGED, OnItemChanged)
ON_NOTIFY_REFLECT(LVN_BEGINLABELEDIT, OnBeginLabelEdit)
ON_NOTIFY_REFLECT(LVN_ENDLABELEDIT, OnEndLabelEdit)
- ON_NOTIFY_REFLECT(NM_CLICK, OnClick)
+ ON_NOTIFY_REFLECT(NM_CLICK, OnClick)
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
@@ -273,7 +273,7 @@
/////////////////////////////////////////////////////////////////////////////
// CDirView message handlers
-void CDirView::OnInitialUpdate()
+void CDirView::OnInitialUpdate()
{
const int iconCX = 16;
const int iconCY = 16;
@@ -295,7 +295,7 @@
// Load the icons used for the list view (to reflect diff status)
// NOTE: these must be in the exactly the same order than in enum
// definition in begin of this file!
- VERIFY (m_imageList.Create (iconCX, iconCY, ILC_COLOR32 | ILC_MASK, 15, 1));
+ VERIFY (m_imageList.Create(iconCX, iconCY, ILC_COLOR32 | ILC_MASK, 15, 1));
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_LFILE)));
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_RFILE)));
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_NOTEQUALFILE)));
@@ -315,7 +315,7 @@
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_COMPARE_ABORTED)));
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_NOTEQUALTEXTFILE)));
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_EQUALTEXTFILE)));
- m_pList->SetImageList (&m_imageList, LVSIL_SMALL);
+ m_pList->SetImageList(&m_imageList, LVSIL_SMALL);
// Load the icons used for the list view (expanded/collapsed state icons)
VERIFY(m_imageState.Create(IDB_TREE_STATE, 16, 1, RGB(255, 0, 255)));
@@ -420,7 +420,7 @@
* @brief Called when folder compare row is double-clicked with mouse.
* Selected item is opened to folder or file compare.
*/
-void CDirView::OnLButtonDblClk(UINT nFlags, CPoint point)
+void CDirView::OnLButtonDblClk(UINT nFlags, CPoint point)
{
LVHITTESTINFO lvhti;
lvhti.pt = point;
@@ -458,9 +458,9 @@
/**
* @brief Redisplay items in subfolder
- * @param [in] diffpos First item position in subfolder.
+ * @param [in] diffpos First item position in subfolder.
* @param [in] level Indent level
- * @param [in,out] index Index of the item to be inserted.
+ * @param [in,out] index Index of the item to be inserted.
* @param [in,out] alldiffs Number of different items
*/
void CDirView::RedisplayChildren(UINT_PTR diffpos, int level, UINT &index, int &alldiffs)
@@ -526,7 +526,7 @@
// If non-recursive compare, add special item(s)
String leftParent, rightParent;
if (!pDoc->GetRecursive() ||
- pDoc->AllowUpwardDirectory(leftParent, rightParent) == CDirDoc::AllowUpwardDirectory::ParentIsTempPath)
+ pDoc->AllowUpwardDirectory(leftParent, rightParent) == CDirDoc::AllowUpwardDirectory::ParentIsTempPath)
{
cnt += AddSpecialItems();
}
@@ -550,7 +550,7 @@
// Make sure window is active
GetParentFrame()->ActivateFrame();
- int i=0;
+ int i = 0;
if (point.x == -1 && point.y == -1)
{
//keystroke invocation
@@ -560,7 +560,9 @@
point = rect.TopLeft();
point.Offset(5, 5);
- } else {
+ }
+ else
+ {
// Check if user right-clicked on header
// convert screen coordinates to client coordinates of listview
CPoint insidePt = point;
@@ -570,7 +572,7 @@
HDHITTESTINFO hhti;
memset(&hhti, 0, sizeof(hhti));
hhti.pt = insidePt;
- int col = GetListCtrl().GetHeaderCtrl()->SendMessage(HDM_HITTEST, 0, (LPARAM)&hhti);
+ int col = GetListCtrl().GetHeaderCtrl()->SendMessage(HDM_HITTEST, 0, (LPARAM) & hhti);
if (col >= 0)
{
// Presumably hhti.flags & HHT_ONHEADER is true
@@ -585,7 +587,7 @@
lhti.pt = insidePt;
i = GetListCtrl().HitTest(insidePt);
TRACE(_T("i=%d\n"), i);
- if (i<0)
+ if (i < 0)
return;
}
@@ -729,8 +731,8 @@
// note the prediffer flag for 'files present on both sides and not skipped'
if (!di.diffcode.isDirectory() && !di.diffcode.isBin() &&
- !di.diffcode.isSideLeftOnly() && !di.diffcode.isSideRightOnly() &&
- !di.diffcode.isResultFiltered())
+ !di.diffcode.isSideLeftOnly() && !di.diffcode.isSideRightOnly() &&
+ !di.diffcode.isResultFiltered())
{
String leftPath = di.getLeftFilepath(pDoc->GetLeftBasePath()) +
_T("\\") + di.left.filename;
@@ -766,14 +768,14 @@
// invoke context menu
// this will invoke all the OnUpdate methods to enable/disable the individual items
BOOL nCmd = pPopup->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, point.x, point.y,
- AfxGetMainWnd());
+ AfxGetMainWnd());
if (nCmd)
{
HWND hWnd = AfxGetMainWnd()->GetSafeHwnd();
- ( m_pShellContextMenuLeft && m_pShellContextMenuLeft->InvokeCommand(nCmd, hWnd) )
- || ( m_pShellContextMenuRight && m_pShellContextMenuRight->InvokeCommand(nCmd, hWnd) )
- // we have called TrackPopupMenu with TPM_RETURNCMD flag so we have to post message ourselves
- || PostMessage(WM_COMMAND, MAKEWPARAM(nCmd, 0), 0);
+ (m_pShellContextMenuLeft && m_pShellContextMenuLeft->InvokeCommand(nCmd, hWnd))
+ || (m_pShellContextMenuRight && m_pShellContextMenuRight->InvokeCommand(nCmd, hWnd))
+ // we have called TrackPopupMenu with TPM_RETURNCMD flag so we have to post message ourselves
+ || PostMessage(WM_COMMAND, MAKEWPARAM(nCmd, 0), 0);
}
pFrame->m_bAutoMenuEnable = TRUE;
}
@@ -794,8 +796,8 @@
// invoke context menu
// this will invoke all the OnUpdate methods to enable/disable the individual items
pPopup->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON, point.x, point.y,
- AfxGetMainWnd());
-}
+ AfxGetMainWnd());
+}
/**
* @brief Gets Explorer's context menu for a group of selected files.
@@ -821,8 +823,8 @@
continue;
String currentDir = (side == SIDE_LEFT) ?
- di.getLeftFilepath(pDoc->GetLeftBasePath()) :
- di.getRightFilepath(pDoc->GetRightBasePath());
+ di.getLeftFilepath(pDoc->GetLeftBasePath()) :
+ di.getRightFilepath(pDoc->GetRightBasePath());
String filename = ((side == SIDE_LEFT) ? di.left.filename : di.right.filename);
@@ -847,7 +849,7 @@
{
CString s;
LangFormatString1(s, nStringResource, szPath);
- pPopup->ModifyMenu(nMenuId, MF_BYCOMMAND|MF_STRING, nMenuId, s);
+ pPopup->ModifyMenu(nMenuId, MF_BYCOMMAND | MF_STRING, nMenuId, s);
}
@@ -890,23 +892,23 @@
}
/// Update context menu Copy Right to Left item
-void CDirView::OnUpdateCtxtDirCopyRightToLeft(CCmdUI* pCmdUI)
+void CDirView::OnUpdateCtxtDirCopyRightToLeft(CCmdUI* pCmdUI)
{
DoUpdateDirCopyRightToLeft(pCmdUI, eContext);
}
/// Update context menu Copy Left to Right item
-void CDirView::OnUpdateCtxtDirCopyLeftToRight(CCmdUI* pCmdUI)
+void CDirView::OnUpdateCtxtDirCopyLeftToRight(CCmdUI* pCmdUI)
{
DoUpdateDirCopyLeftToRight(pCmdUI, eContext);
}
/// Update main menu Copy Right to Left item
-void CDirView::OnUpdateDirCopyRightToLeft(CCmdUI* pCmdUI)
+void CDirView::OnUpdateDirCopyRightToLeft(CCmdUI* pCmdUI)
{
DoUpdateDirCopyRightToLeft(pCmdUI, eMain);
}
/// Update main menu Copy Left to Right item
-void CDirView::OnUpdateDirCopyLeftToRight(CCmdUI* pCmdUI)
+void CDirView::OnUpdateDirCopyLeftToRight(CCmdUI* pCmdUI)
{
DoUpdateDirCopyLeftToRight(pCmdUI, eMain);
}
@@ -918,8 +920,8 @@
pCmdUI->Enable(FALSE);
else
{
- int sel=-1;
- int legalcount=0, selcount=0;
+ int sel = -1;
+ int legalcount = 0, selcount = 0;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -927,8 +929,8 @@
++legalcount;
++selcount;
}
- pCmdUI->Enable(legalcount>0);
- if (menuType==eContext)
+ pCmdUI->Enable(legalcount > 0);
+ if (menuType == eContext)
{
CString s;
if (legalcount == selcount)
@@ -947,8 +949,8 @@
pCmdUI->Enable(FALSE);
else
{
- int sel=-1;
- int legalcount=0, selcount=0;
+ int sel = -1;
+ int legalcount = 0, selcount = 0;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -956,8 +958,8 @@
++legalcount;
++selcount;
}
- pCmdUI->Enable(legalcount>0);
- if (menuType==eContext)
+ pCmdUI->Enable(legalcount > 0);
+ if (menuType == eContext)
{
CString s;
if (legalcount == selcount)
@@ -1019,7 +1021,7 @@
}
/// Do any last minute work as view closes
-void CDirView::OnDestroy()
+void CDirView::OnDestroy()
{
DeleteAllDisplayItems();
@@ -1035,9 +1037,9 @@
/**
* @brief Open selected item when user presses ENTER key.
*/
-void CDirView::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags)
+void CDirView::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags)
{
- if(nChar==VK_RETURN)
+ if (nChar == VK_RETURN)
{
int sel = GetFocusedItem();
if (sel >= 0)
@@ -1063,7 +1065,7 @@
/**
* @brief Expand/collapse subfolder when user presses right/left arrow key.
*/
-void CDirView::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
+void CDirView::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
{
int sel = GetFocusedItem();
switch (nChar)
@@ -1168,7 +1170,7 @@
// fall through (no break!)
case CDirDoc::AllowUpwardDirectory::ParentIsRegularPath:
GetMainFrame()->DoFileOpen(leftParent.c_str(), rightParent.c_str(),
- FFILEOPEN_NOMRU, FFILEOPEN_NOMRU, pDoc->GetRecursive(), pDoc);
+ FFILEOPEN_NOMRU, FFILEOPEN_NOMRU, pDoc->GetRecursive(), pDoc);
// fall through (no break!)
case CDirDoc::AllowUpwardDirectory::No:
break;
@@ -1193,7 +1195,7 @@
if (*sel2 == -1)
return true;
int extra = m_pList->GetNextItem(*sel2, LVNI_SELECTED);
- return (extra ==-1);
+ return (extra == -1);
}
/**
@@ -1220,7 +1222,7 @@
{
// Browse to parent folder(s) selected
// SPECIAL_ITEM_POS is position for
- // special items, but there is currenly
+ // special items, but there is currenly
// only one (parent folder)
OpenParentDirectory();
}
@@ -1374,7 +1376,7 @@
}
// Ensure that di1 is on left (swap if needed)
if ((*di1)->diffcode.isSideRightOnly() || ((*di1)->diffcode.isSideBoth() &&
- (*di2)->diffcode.isSideLeftOnly()))
+ (*di2)->diffcode.isSideLeftOnly()))
{
DIFFITEM * temp = *di1;
*di1 = *di2;
@@ -1395,7 +1397,7 @@
{
LangMessageBox(IDS_INVALID_DIRECTORY, MB_ICONSTOP);
return false;
- }
+ }
}
return true;
}
@@ -1416,7 +1418,7 @@
// First, figure out what was selected (store into pos1 & pos2)
UINT_PTR pos1 = NULL, pos2 = NULL;
- int sel1=-1, sel2=-1;
+ int sel1 = -1, sel2 = -1;
if (!GetSelectedItems(&sel1, &sel2))
{
// Must have 1 or 2 items selected
@@ -1478,7 +1480,7 @@
// Binary attributes are set after files are unpacked
// so after plugins such as the MS-Office plugins have had a chance to make them textual
- // We haven't done unpacking yet in this diff, but if a binary flag is already set,
+ // We haven't done unpacking yet in this diff, but if a binary flag is already set,
// then it was set in a previous diff after unpacking, so we trust it
// Close open documents first (ask to save unsaved data)
@@ -1502,7 +1504,7 @@
DWORD rightFlags = bRightRO ? FFILEOPEN_READONLY : 0;
GetMainFrame()->ShowMergeDoc(pDoc, filelocLeft, filelocRight,
- leftFlags, rightFlags, infoUnpacker);
+ leftFlags, rightFlags, infoUnpacker);
}
}
@@ -1512,7 +1514,7 @@
// First, figure out what was selected (store into pos1 & pos2)
UINT_PTR pos1 = NULL, pos2 = NULL;
- int sel1=-1, sel2=-1;
+ int sel1 = -1, sel2 = -1;
if (!GetSelectedItems(&sel1, &sel2))
{
// Must have 1 or 2 items selected
@@ -1594,12 +1596,12 @@
}
/// Enable/disable Delete Right menu choice on context menu
-void CDirView::OnUpdateCtxtDirDelRight(CCmdUI* pCmdUI)
+void CDirView::OnUpdateCtxtDirDelRight(CCmdUI* pCmdUI)
{
DoUpdateCtxtDirDelRight(pCmdUI);
}
/// Enable/disable Delete Both menu choice on context menu
-void CDirView::OnUpdateCtxtDirDelBoth(CCmdUI* pCmdUI)
+void CDirView::OnUpdateCtxtDirDelBoth(CCmdUI* pCmdUI)
{
DoUpdateCtxtDirDelBoth(pCmdUI);
}
@@ -1611,8 +1613,8 @@
pCmdUI->Enable(FALSE);
else
{
- int sel=-1;
- int count=0, total=0;
+ int sel = -1;
+ int count = 0, total = 0;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -1620,7 +1622,7 @@
++count;
++total;
}
- pCmdUI->Enable(count>0);
+ pCmdUI->Enable(count > 0);
CString s;
if (count == total)
@@ -1632,14 +1634,14 @@
}
/// Should Delete right be enabled or disabled ?
-void CDirView::DoUpdateCtxtDirDelRight(CCmdUI* pCmdUI)
+void CDirView::DoUpdateCtxtDirDelRight(CCmdUI* pCmdUI)
{
if (GetDocument()->GetReadOnly(FALSE))
pCmdUI->Enable(FALSE);
else
{
- int sel=-1;
- int count=0, total=0;
+ int sel = -1;
+ int count = 0, total = 0;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -1647,8 +1649,8 @@
++count;
++total;
}
- pCmdUI->Enable(count>0);
-
+ pCmdUI->Enable(count > 0);
+
CString s;
if (count == total)
LangFormatString1(s, IDS_DEL_RIGHT_FMT, NumToStr(total).c_str());
@@ -1661,14 +1663,14 @@
/**
* @brief Should Delete both be enabled or disabled ?
*/
-void CDirView::DoUpdateCtxtDirDelBoth(CCmdUI* pCmdUI)
+void CDirView::DoUpdateCtxtDirDelBoth(CCmdUI* pCmdUI)
{
if (GetDocument()->GetReadOnly(TRUE) || GetDocument()->GetReadOnly(FALSE))
pCmdUI->Enable(FALSE);
else
{
- int sel=-1;
- int count=0, total=0;
+ int sel = -1;
+ int count = 0, total = 0;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -1676,7 +1678,7 @@
++count;
++total;
}
- pCmdUI->Enable(count>0);
+ pCmdUI->Enable(count > 0);
CString s;
if (count == total)
@@ -1690,10 +1692,10 @@
/**
* @brief Enable/disable "Copy | Left to..." and update item text
*/
-void CDirView::DoUpdateCtxtDirCopyLeftTo(CCmdUI* pCmdUI)
+void CDirView::DoUpdateCtxtDirCopyLeftTo(CCmdUI* pCmdUI)
{
- int sel=-1;
- int count=0, total=0;
+ int sel = -1;
+ int count = 0, total = 0;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -1701,7 +1703,7 @@
++count;
++total;
}
- pCmdUI->Enable(count>0);
+ pCmdUI->Enable(count > 0);
CString s;
if (count == total)
@@ -1714,10 +1716,10 @@
/**
* @brief Enable/disable "Copy | Right to..." and update item text
*/
-void CDirView::DoUpdateCtxtDirCopyRightTo(CCmdUI* pCmdUI)
+void CDirView::DoUpdateCtxtDirCopyRightTo(CCmdUI* pCmdUI)
{
- int sel=-1;
- int count=0, total=0;
+ int sel = -1;
+ int count = 0, total = 0;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -1725,7 +1727,7 @@
++count;
++total;
}
- pCmdUI->Enable(count>0);
+ pCmdUI->Enable(count > 0);
CString s;
if (count == total)
@@ -1738,10 +1740,10 @@
/**
* @brief Enable/disable "Move | Left to..." and update item text
*/
-void CDirView::DoUpdateCtxtDirMoveLeftTo(CCmdUI* pCmdUI)
+void CDirView::DoUpdateCtxtDirMoveLeftTo(CCmdUI* pCmdUI)
{
- int sel=-1;
- int count=0, total=0;
+ int sel = -1;
+ int count = 0, total = 0;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -1749,7 +1751,7 @@
++count;
++total;
}
- pCmdUI->Enable(count>0);
+ pCmdUI->Enable(count > 0);
CString s;
if (count == total)
@@ -1762,10 +1764,10 @@
/**
* @brief Enable/disable "Move | Right to..." and update item text
*/
-void CDirView::DoUpdateCtxtDirMoveRightTo(CCmdUI* pCmdUI)
+void CDirView::DoUpdateCtxtDirMoveRightTo(CCmdUI* pCmdUI)
{
- int sel=-1;
- int count=0, total=0;
+ int sel = -1;
+ int count = 0, total = 0;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
const DIFFITEM& di = GetDiffItem(sel);
@@ -1773,7 +1775,7 @@
++count;
++total;
}
- pCmdUI->Enable(count>0);
+ pCmdUI->Enable(count > 0);
CString s;
if (count == total)
@@ -1830,7 +1832,7 @@
DIFFITEM & CDirView::GetDiffItemRef(int sel)
{
UINT_PTR diffpos = GetItemKey(sel);
-
+
// If it is special item, return empty DIFFITEM
if (diffpos == SPECIAL_ITEM_POS)
{
@@ -1912,7 +1914,7 @@
// return selected item index, or -1 if none or multiple
int CDirView::GetSingleSelectedItem() const
{
- int sel=-1, sel2=-1;
+ int sel = -1, sel2 = -1;
sel = m_pList->GetNextItem(sel, LVNI_SELECTED);
if (sel == -1) return -1;
sel2 = m_pList->GetNextItem(sel, LVNI_SELECTED);
@@ -1944,7 +1946,7 @@
// Used for Open
void CDirView::DoUpdateOpen(CCmdUI* pCmdUI)
{
- int sel1=-1, sel2=-1;
+ int sel1 = -1, sel2 = -1;
if (!GetSelectedItems(&sel1, &sel2))
{
// 0 items or more than 2 items seleted
@@ -1986,7 +1988,7 @@
sel = -1;
}
- pCmdUI->Enable(sel>=0);
+ pCmdUI->Enable(sel >= 0);
}
// used for OpenRight
@@ -2000,7 +2002,7 @@
sel = -1;
}
- pCmdUI->Enable(sel>=0);
+ pCmdUI->Enable(sel >= 0);
}
// used for OpenLeftWith
@@ -2014,7 +2016,7 @@
sel = -1;
}
- pCmdUI->Enable(sel>=0);
+ pCmdUI->Enable(sel >= 0);
}
// used for OpenRightWith
@@ -2028,7 +2030,7 @@
sel = -1;
}
- pCmdUI->Enable(sel>=0);
+ pCmdUI->Enable(sel >= 0);
}
/**
@@ -2059,7 +2061,7 @@
{
const DIFFITEM& di = GetDiffItem(sel);
if (di.diffcode.diffcode != 0 &&
- (IsItemDeletableOnLeft(di) || IsItemDeletableOnRight(di)))
+ (IsItemDeletableOnLeft(di) || IsItemDeletableOnRight(di)))
{
++count;
}
@@ -2072,7 +2074,7 @@
*/
void CDirView::DoUpdateCopyFilenames(CCmdUI* pCmdUI)
{
- int sel =- 1;
+ int sel = - 1;
int count = 0;
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
@@ -2111,7 +2113,7 @@
int sel = m_pList->GetNextItem(ind, LVNI_SELECTED);
DIFFITEM &di = GetDiffItemRef(ind);
ind = sel;
-
+
return di;
}
@@ -2284,7 +2286,7 @@
{
selected = m_pList->GetItemState(i, LVIS_SELECTED);
focused = m_pList->GetItemState(i, LVIS_FOCUSED);
-
+
if (selected == LVIS_SELECTED && focused == LVIS_FOCUSED)
{
m_pList->EnsureVisible(i, FALSE);
@@ -2296,7 +2298,7 @@
void CDirView::OnUpdateCurdiff(CCmdUI* pCmdUI)
{
- int selection = GetFirstSelectedInd();
+ int selection = GetFirstSelectedInd();
if (selection > -1)
pCmdUI->Enable(TRUE);
else
@@ -2313,7 +2315,7 @@
while (i < count && found == FALSE)
{
- focused = m_pList->GetItemState(i, LVIS_FOCUSED);
+ focused = m_pList->GetItemState(i, LVIS_FOCUSED);
if (focused == LVIS_FOCUSED)
{
retInd = i;
@@ -2336,7 +2338,7 @@
const DIFFITEM &di = GetItemAt(i);
if (IsItemNavigableDiff(di))
{
- foundInd = i;
+ foundInd = i;
found = TRUE;
}
i++;
@@ -2356,7 +2358,7 @@
const DIFFITEM &di = GetItemAt(i);
if (IsItemNavigableDiff(di))
{
- foundInd = i;
+ foundInd = i;
found = TRUE;
}
i--;
@@ -2382,7 +2384,7 @@
* @brief Move focus to specified item (and selection if multiple items not selected)
*
* Moves the focus from item [currentInd] to item [i]
- * Additionally, if there are not multiple items selected,
+ * Additionally, if there are not multiple items selected,
* deselects item [currentInd] and selects item [i]
*/
void CDirView::MoveFocus(int currentInd, int i, int selCount)
@@ -2517,14 +2519,14 @@
return 0; // return value unused
}
-BOOL CDirView::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
+BOOL CDirView::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
{
NMHDR * hdr = reinterpret_cast<NMHDR *>(lParam);
if (hdr->code == HDN_ENDDRAG)
return OnHeaderEndDrag((LPNMHEADER)hdr, pResult);
if (hdr->code == HDN_BEGINDRAG)
return OnHeaderBeginDrag((LPNMHEADER)hdr, pResult);
-
+
return CListView::OnNotify(wParam, lParam, pResult);
}
@@ -2566,7 +2568,7 @@
int dest = hdr->pitem->iOrder;
BOOL allowDrop = TRUE;
*pResult = !allowDrop;
- if (allowDrop && src!=dest && dest!=-1)
+ if (allowDrop && src != dest && dest != -1)
{
MoveColumn(src, dest);
}
@@ -2588,7 +2590,7 @@
lvcol.cx = 0;
lvcol.pszText = 0;
lvcol.iSubItem = 0;
- for (int i=0; i<m_numcols; ++i)
+ for (int i = 0; i < m_numcols; ++i)
{
lvcol.iOrder = i;
GetListCtrl().SetColumn(i, &lvcol);
@@ -2604,14 +2606,14 @@
if (h->GetItemCount())
{
dummyflag = true;
- while (m_pList->GetHeaderCtrl()->GetItemCount()>1)
+ while (m_pList->GetHeaderCtrl()->GetItemCount() > 1)
m_pList->DeleteColumn(1);
}
- for (int i=0; i<m_dispcols; ++i)
+ for (int i = 0; i < m_dispcols; ++i)
{
LVCOLUMN lvc;
- lvc.mask = LVCF_FMT+LVCF_SUBITEM+LVCF_TEXT;
+ lvc.mask = LVCF_FMT + LVCF_SUBITEM + LVCF_TEXT;
lvc.fmt = LVCFMT_LEFT;
lvc.cx = 0;
lvc.pszText = _T("text");
@@ -2627,7 +2629,7 @@
// Necessary when user reorders columns
void CDirView::SetColumnWidths()
{
- for (int i=0; i<m_numcols; ++i)
+ for (int i = 0; i < m_numcols; ++i)
{
int phy = ColLogToPhys(i);
if (phy >= 0)
@@ -2642,7 +2644,7 @@
/** @brief store current column widths into registry */
void CDirView::SaveColumnWidths()
{
- for (int i=0; i < m_numcols; i++)
+ for (int i = 0; i < m_numcols; i++)
{
int phy = ColLogToPhys(i);
if (phy >= 0)
@@ -2660,7 +2662,7 @@
PostMessage(WM_TIMER, COLUMN_REORDER);
}
-void CDirView::OnTimer(UINT_PTR nIDEvent)
+void CDirView::OnTimer(UINT_PTR nIDEvent)
{
if (nIDEvent == COLUMN_REORDER)
{
@@ -2741,7 +2743,7 @@
SaveColumnOrders();
}
-void CDirView::OnCtxtOpenWithUnpacker()
+void CDirView::OnCtxtOpenWithUnpacker()
{
int sel = -1;
sel = m_pList->GetNextItem(sel, LVNI_SELECTED);
@@ -2762,7 +2764,7 @@
}
-void CDirView::OnUpdateCtxtOpenWithUnpacker(CCmdUI* pCmdUI)
+void CDirView::OnUpdateCtxtOpenWithUnpacker(CCmdUI* pCmdUI)
{
if (!GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED))
{
@@ -2775,7 +2777,7 @@
pCmdUI->Enable(FALSE);
else
{
- int sel=-1;
+ int sel = -1;
sel = m_pList->GetNextItem(sel, LVNI_SELECTED);
const DIFFITEM& di = GetDiffItem(sel);
if (IsItemDeletableOnBoth(di))
@@ -2791,7 +2793,7 @@
void CDirView::GetCurrentColRegKeys(CStringArray & colKeys)
{
int nphyscols = GetListCtrl().GetHeaderCtrl()->GetItemCount();
- for (int col=0; col<nphyscols; ++col)
+ for (int col = 0; col < nphyscols; ++col)
{
int logcol = ColPhysToLog(col);
colKeys.Add(GetColRegValueNameBase(logcol));
@@ -2801,7 +2803,7 @@
/**
* @brief Generate report from dir compare results.
*/
-void CDirView::OnToolsGenerateReport()
+void CDirView::OnToolsGenerateReport()
{
CDirDoc *pDoc = GetDocument();
if (!pDoc->HasDiffs())
@@ -2881,7 +2883,7 @@
/**
* @brief Zip selected files from left side.
*/
-void CDirView::OnCtxtDirZipLeft()
+void CDirView::OnCtxtDirZipLeft()
{
if (!HasZipSupport())
{
@@ -2892,14 +2894,14 @@
DirItemEnumerator
(
this, LVNI_SELECTED
- | DirItemEnumerator::Left
+ | DirItemEnumerator::Left
).CompressArchive();
}
/**
* @brief Zip selected files from right side.
*/
-void CDirView::OnCtxtDirZipRight()
+void CDirView::OnCtxtDirZipRight()
{
if (!HasZipSupport())
{
@@ -2910,14 +2912,14 @@
DirItemEnumerator
(
this, LVNI_SELECTED
- | DirItemEnumerator::Right
+ | DirItemEnumerator::Right
).CompressArchive();
}
/**
* @brief Zip selected files from both sides, using original/altered format.
*/
-void CDirView::OnCtxtDirZipBoth()
+void CDirView::OnCtxtDirZipBoth()
{
if (!HasZipSupport())
{
@@ -2928,16 +2930,16 @@
DirItemEnumerator
(
this, LVNI_SELECTED
- | DirItemEnumerator::Original
- | DirItemEnumerator::Altered
- | DirItemEnumerator::BalanceFolders
+ | DirItemEnumerator::Original
+ | DirItemEnumerator::Altered
+ | DirItemEnumerator::BalanceFolders
).CompressArchive();
}
/**
* @brief Zip selected diffs from both sides, using original/altered format.
*/
-void CDirView::OnCtxtDirZipBothDiffsOnly()
+void CDirView::OnCtxtDirZipBothDiffsOnly()
{
if (!HasZipSupport())
{
@@ -2948,10 +2950,10 @@
DirItemEnumerator
(
this, LVNI_SELECTED
- | DirItemEnumerator::Original
- | DirItemEnumerator::Altered
- | DirItemEnumerator::BalanceFolders
- | DirItemEnumerator::DiffsOnly
+ | DirItemEnumerator::Original
+ | DirItemEnumerator::Altered
+ | DirItemEnumerator::BalanceFolders
+ | DirItemEnumerator::DiffsOnly
).CompressArchive();
}
@@ -3031,7 +3033,7 @@
*/
void CDirView::ResetColumnWidths()
{
- for (int i=0; i < m_numcols; i++)
+ for (int i = 0; i < m_numcols; i++)
{
int phy = ColLogToPhys(i);
if (phy >= 0)
@@ -3220,19 +3222,19 @@
/**
* @brief update menu item
*/
-void CDirView::OnUpdateHideFilenames(CCmdUI* pCmdUI)
+void CDirView::OnUpdateHideFilenames(CCmdUI* pCmdUI)
{
pCmdUI->Enable(m_pList->GetSelectedCount() != 0);
}
/// User chose (context menu) Move left to...
-void CDirView::OnCtxtDirMoveLeftTo()
+void CDirView::OnCtxtDirMoveLeftTo()
{
DoMoveLeftTo();
}
/// User chose (context menu) Move right to...
-void CDirView::OnCtxtDirMoveRightTo()
+void CDirView::OnCtxtDirMoveRightTo()
{
DoMoveRightTo();
}
@@ -3240,7 +3242,7 @@
/**
* @brief Update "Move | Right to..." item
*/
-void CDirView::OnUpdateCtxtDirMoveRightTo(CCmdUI* pCmdUI)
+void CDirView::OnUpdateCtxtDirMoveRightTo(CCmdUI* pCmdUI)
{
// Because move deletes original item, origin side
// cannot be read-only
@@ -3255,7 +3257,7 @@
/**
* @brief Update "Move | Left to..." item
*/
-void CDirView::OnUpdateCtxtDirMoveLeftTo(CCmdUI* pCmdUI)
+void CDirView::OnUpdateCtxtDirMoveLeftTo(CCmdUI* pCmdUI)
{
// Because move deletes original item, origin side
// cannot be read-only
@@ -3303,7 +3305,7 @@
// If item's selected state changed
if ((pNMListView->uOldState & LVIS_SELECTED) !=
- (pNMListView->uNewState & LVIS_SELECTED))
+ (pNMListView->uNewState & LVIS_SELECTED))
{
CString msg;
int items = GetSelectedCount();
@@ -3397,7 +3399,7 @@
/**
* @brief Called to update the item count in the status bar
*/
-void CDirView::OnUpdateStatusNum(CCmdUI* pCmdUI)
+void CDirView::OnUpdateStatusNum(CCmdUI* pCmdUI)
{
CString s; // text to display
@@ -3427,7 +3429,7 @@
--focusItem;
--count;
}
- sIdx.Format(_T("%ld"), focusItem+1);
+ sIdx.Format(_T("%ld"), focusItem + 1);
sCnt.Format(_T("%ld"), count);
// "Item %1 of %2"
LangFormatString2(s, IDS_DIRVIEW_STATUS_FMT_FOCUS, sIdx, sCnt);
@@ -3563,7 +3565,7 @@
/**
* @brief Update "File Encoding" item
*/
-void CDirView::OnUpdateFileEncoding(CCmdUI* pCmdUI)
+void CDirView::OnUpdateFileEncoding(CCmdUI* pCmdUI)
{
DoUpdateFileEncodingDialog(pCmdUI);
}
@@ -3595,7 +3597,7 @@
/**
* @brief Allow edit "Paste" when renaming an item.
*/
-void CDirView::OnEditCopy()
+void CDirView::OnEditCopy()
{
CEdit *pEdit = m_pList->GetEditControl();
if (NULL != pEdit)
@@ -3607,7 +3609,7 @@
/**
* @brief Allow edit "Cut" when renaming an item.
*/
-void CDirView::OnEditCut()
+void CDirView::OnEditCut()
{
CEdit *pEdit = m_pList->GetEditControl();
if (NULL != pEdit)
@@ -3619,7 +3621,7 @@
/**
* @brief Allow edit "Paste" when renaming an item.
*/
-void CDirView::OnEditPaste()
+void CDirView::OnEditPaste()
{
CEdit *pEdit = m_pList->GetEditControl();
if (NULL != pEdit)
@@ -3631,7 +3633,7 @@
/**
* @brief Allow edit "Undo" when renaming an item.
*/
-void CDirView::OnEditUndo()
+void CDirView::OnEditUndo()
{
CEdit *pEdit = m_pList->GetEditControl();
if (NULL != pEdit)
@@ -3670,7 +3672,7 @@
* @brief Returns CShellContextMenu object that owns given HMENU.
*
* @param [in] hMenu Handle to the menu to check ownership of.
- * @return Either m_pShellContextMenuLeft, m_pShellContextMenuRight
+ * @return Either m_pShellContextMenuLeft, m_pShellContextMenuRight
* or NULL if hMenu is not owned by these two.
*/
CShellContextMenu* CDirView::GetCorrespondingShellContextMenu(HMENU hMenu) const
Modified: branches/R2_14/Src/DirView.h
===================================================================
--- branches/R2_14/Src/DirView.h 2010-10-18 09:16:32 UTC (rev 7314)
+++ branches/R2_14/Src/DirView.h 2010-10-18 13:52:00 UTC (rev 7315)
@@ -21,7 +21,7 @@
* @file DirView.h
*
* @brief Declaration of class CDirView
- */
+ */
//
// ID line follows -- this is updated by SVN
// $Id$
@@ -60,15 +60,15 @@
// and each set of flags is in a different hex digit
// to make debugging easier
// These can always be packed down in the future
- INVALID_CODE=0,
- VISIBILITY=0x3, VISIBLE=0x1, HIDDEN=0x2, EXPANDED=0x4
+ INVALID_CODE = 0,
+ VISIBILITY = 0x3, VISIBLE = 0x1, HIDDEN = 0x2, EXPANDED = 0x4
};
};
/**
* @brief Position value for special items (..) in directory compare view.
*/
-const UINT_PTR SPECIAL_ITEM_POS = (UINT_PTR)-1L;
+const UINT_PTR SPECIAL_ITEM_POS = (UINT_PTR) - 1L;
/** Default column width in directory compare */
const UINT DefColumnWidth = 150;
@@ -127,7 +127,7 @@
// Implementation types
private:
- typedef enum { SIDE_LEFT=1, SIDE_RIGHT } SIDE_TYPE;
+ typedef enum { SIDE_LEFT = 1, SIDE_RIGHT } SIDE_TYPE;
// Implementation in DirActions.cpp
private:
@@ -230,9 +230,9 @@
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CDirView)
- public:
+public:
virtual void OnInitialUpdate();
- protected:
+protected:
virtual BOOL PreTranslateMessage(MSG* pMsg);
virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
virtual BOOL OnChildNotify(UINT, WPARAM, LPARAM, LRESULT*);
@@ -251,9 +251,9 @@
void WarnContentsChanged(const CString & failedPath);
void OpenSpecialItems(UINT_PTR pos1, UINT_PTR pos2);
bool OpenOneItem(UINT_PTR pos1, DIFFITEM **di1, DIFFITEM **di2,
- String &path1, String &path2, int & sel1, bool & isDir);
+ String &path1, String &path2, int & sel1, bool & isDir);
bool OpenTwoItems(UINT_PTR pos1, UINT_PTR pos2, DIFFITEM **di1, DIFFITEM **di2,
- String &path1, String &path2, int & sel1, int & sel2, bool & isDir);
+ String &path1, String &path2, int & sel1, int & sel2, bool & isDir);
bool CreateFoldersPair(DIFFITEM & di, bool side1);
// Implementation data
@@ -265,7 +265,7 @@
CListCtrl * m_pList;
int m_numcols;
int m_dispcols;
- std::vector<int> m_colorder; /**< colorder[logical#]=physical# */
+ std::vector<int> m_colorder; /**< colorder[logical#]=physical# */
std::vector<int> m_invcolorder; /**< invcolorder[physical]=logical# */
BOOL m_bEscCloses; /**< Cached value for option for ESC closing window */
CFont m_font; /**< User-selected font */
@@ -447,7 +447,7 @@
#ifndef _DEBUG // debug version in DirView.cpp
inline CDirDoc* CDirView::GetDocument()
- { return (CDirDoc*)m_pDocument; }
+{ return (CDirDoc*)m_pDocument; }
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-18 09:16:38
|
Revision: 7314
http://winmerge.svn.sourceforge.net/winmerge/?rev=7314&view=rev
Author: gerundt
Date: 2010-10-18 09:16:32 +0000 (Mon, 18 Oct 2010)
Log Message:
-----------
Fix whitespace in ShellExtension sources from R2_14
Modified Paths:
--------------
branches/R2_14/ShellExtension/Resource.h
branches/R2_14/ShellExtension/ShellExtension.cpp
branches/R2_14/ShellExtension/WinMergeShell.cpp
branches/R2_14/ShellExtension/WinMergeShell.h
Modified: branches/R2_14/ShellExtension/Resource.h
===================================================================
--- branches/R2_14/ShellExtension/Resource.h 2010-10-18 08:58:19 UTC (rev 7313)
+++ branches/R2_14/ShellExtension/Resource.h 2010-10-18 09:16:32 UTC (rev 7314)
@@ -17,7 +17,7 @@
#define IDB_WINMERGE 202
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 203
Modified: branches/R2_14/ShellExtension/ShellExtension.cpp
===================================================================
--- branches/R2_14/ShellExtension/ShellExtension.cpp 2010-10-18 08:58:19 UTC (rev 7313)
+++ branches/R2_14/ShellExtension/ShellExtension.cpp 2010-10-18 09:16:32 UTC (rev 7314)
@@ -7,7 +7,7 @@
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or (at
// your option) any later version.
-//
+//
// This program is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -19,11 +19,11 @@
/////////////////////////////////////////////////////////////////////////////
// Look at http://www.codeproject.com/shell/ for excellent guide
// to Windows Shell programming by Michael Dunn.
-//
+//
// $Id$
// Note: Proxy/Stub Information
-// To build a separate proxy/stub DLL,
+// To build a separate proxy/stub DLL,
// run nmake -f ShellExtensionps.mk in the project directory.
#include "stdafx.h"
@@ -48,10 +48,10 @@
BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/)
{
if (dwReason == DLL_PROCESS_ATTACH)
-{
+ {
_Module.Init(ObjectMap, hInstance, &LIBID_SHELLEXTENSIONLib);
DisableThreadLibraryCalls(hInstance);
-}
+ }
else if (dwReason == DLL_PROCESS_DETACH)
_Module.Term();
return TRUE; // ok
@@ -62,7 +62,7 @@
STDAPI DllCanUnloadNow(void)
{
- return (_Module.GetLockCount()==0) ? S_OK : S_FALSE;
+ return (_Module.GetLockCount() == 0) ? S_OK : S_FALSE;
}
/////////////////////////////////////////////////////////////////////////////
@@ -70,7 +70,7 @@
STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
{
- return _Module.GetClassObject(rclsid, riid, ppv);
+ return _Module.GetClassObject(rclsid, riid, ppv);
}
/////////////////////////////////////////////////////////////////////////////
@@ -81,7 +81,7 @@
// If we're on NT, add ourselves to the list of approved shell extensions.
// Note that you should *NEVER* use the overload of CRegKey::SetValue with
- // 4 parameters. It lets you set a value in one call, without having to
+ // 4 parameters. It lets you set a value in one call, without having to
// call CRegKey::Open() first. However, that version of SetValue() has a
// bug in that it requests KEY_ALL_ACCESS to the key. That will fail if the
// user is not an administrator. (The code should request KEY_WRITE, which
@@ -108,12 +108,12 @@
LONG lRet;
lRet = reg.Open(HKEY_LOCAL_MACHINE,
- _T("Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved"));
+ _T("Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved"));
if (ERROR_SUCCESS != lRet)
return E_ACCESSDENIED;
- lRet = reg.WriteString(_T("WinMerge_Shell Extension"),
+ lRet = reg.WriteString(_T("WinMerge_Shell Extension"),
_T("{4E716236-AA30-4C65-B225-D68BBA81E9C2}"));
if (ERROR_SUCCESS != lRet)
@@ -121,7 +121,7 @@
}
// registers object, typelib and all interfaces in typelib
- return _Module.RegisterServer(TRUE);
+ return _Module.RegisterServer(TRUE);
}
/////////////////////////////////////////////////////////////////////////////
@@ -145,10 +145,10 @@
if (ERROR_SUCCESS == lRet)
{
- lRet = reg.DeleteValue( _T("{4E716236-AA30-4C65-B225-D68BBA81E9C2}"));
+ lRet = reg.DeleteValue(_T("{4E716236-AA30-4C65-B225-D68BBA81E9C2}"));
}
}
-
+
return _Module.UnregisterServer(TRUE);
}
Modified: branches/R2_14/ShellExtension/WinMergeShell.cpp
===================================================================
--- branches/R2_14/ShellExtension/WinMergeShell.cpp 2010-10-18 08:58:19 UTC (rev 7313)
+++ branches/R2_14/ShellExtension/WinMergeShell.cpp 2010-10-18 09:16:32 UTC (rev 7314)
@@ -4,7 +4,7 @@
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or (at
// your option) any later version.
-//
+//
// This program is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -16,7 +16,7 @@
/////////////////////////////////////////////////////////////////////////////
// Look at http://www.codeproject.com/shell/ for excellent guide
// to Windows Shell programming by Michael Dunn.
-//
+//
// This extension needs two registry values to be defined:
// HKEY_CURRENT_USER\Software\Thingamahoochie\WinMerge\ContextMenuEnabled
// defines if context menu is shown (extension enabled) and if
@@ -31,7 +31,7 @@
// overwrites 'Executable' if defined. Useful to overwrite
// option set from UI when debugging/testing.
/////////////////////////////////////////////////////////////////////////////
-/**
+/**
* @file WinMergeShell.cpp
*
* @brief Implementation of the ShellExtension class
@@ -48,7 +48,7 @@
#include <sys/types.h>
#include <sys/stat.h>
-/**
+/**
* @brief Flags for enabling and other settings of context menu.
*/
enum ExtensionFlags
@@ -60,7 +60,7 @@
/// Max. filecount to select
static const int MaxFileCount = 2;
-/// Registry path to WinMerge
+/// Registry path to WinMerge
#define REGDIR _T("Software\\Thingamahoochie\\WinMerge")
static const TCHAR f_RegDir[] = REGDIR;
static const TCHAR f_RegLocaleDir[] = REGDIR _T("\\Locale");
@@ -68,7 +68,7 @@
/**
* @name Registry valuenames.
*/
-/*@{*/
+/*@{*/
/** Shell context menuitem enabled/disabled */
static const TCHAR f_RegValueEnabled[] = _T("ContextMenuEnabled");
/** 'Saved' path in advanced mode */
@@ -81,13 +81,17 @@
static const TCHAR f_LanguageId[] = _T("LanguageId");
/*@}*/
-/// Shown menustate
+/**
+ * @brief The states in which the menu can be.
+ * These states define what items are added to the menu and how those
+ * items work.
+ */
enum
{
- MENU_SIMPLE = 0,
- MENU_ONESEL_NOPREV,
- MENU_ONESEL_PREV,
- MENU_TWOSEL,
+ MENU_SIMPLE = 0, /**< Simple menu, only "Compare item" is shown. */
+ MENU_ONESEL_NOPREV, /**< One item selected, no previous selections. */
+ MENU_ONESEL_PREV, /**< One item selected, previous selection exists. */
+ MENU_TWOSEL, /**< Two items are selected. */
};
#define USES_WINMERGELOCALE CWinMergeTempLocale __wmtl__
@@ -99,18 +103,20 @@
private:
LCID m_lcidOld;
public:
- CWinMergeTempLocale() {
+ CWinMergeTempLocale()
+ {
CRegKeyEx reg;
if (reg.Open(HKEY_CURRENT_USER, f_RegLocaleDir) != ERROR_SUCCESS)
return;
m_lcidOld = GetThreadLocale();
- int iLangId = reg.ReadDword(f_LanguageId, (DWORD)-1);
+ int iLangId = reg.ReadDword(f_LanguageId, (DWORD) - 1);
if (iLangId != -1)
SetThreadLocale(MAKELCID(iLangId, SORT_DEFAULT));
}
- ~CWinMergeTempLocale() {
+ ~CWinMergeTempLocale()
+ {
SetThreadLocale(m_lcidOld);
}
};
@@ -124,7 +130,7 @@
{
TCHAR resStr[1024] = {0};
int res = LoadString(_Module.GetModuleInstance(), resourceID, resStr, 1024);
- ATLASSERT(res!= 0);
+ ATLASSERT(res != 0);
String strResource = resStr;
return strResource;
}
@@ -138,8 +144,8 @@
m_dwMenuState = 0;
// compress or stretch icon bitmap according to menu item height
- m_MergeBmp = (HBITMAP)LoadImage(_Module.GetModuleInstance(), MAKEINTRESOURCE(IDB_WINMERGE), IMAGE_BITMAP,
- GetSystemMetrics(SM_CXMENUCHECK), GetSystemMetrics(SM_CYMENUCHECK), LR_DEFAULTCOLOR);
+ m_MergeBmp = (HBITMAP)LoadImage(_Module.GetModuleInstance(), MAKEINTRESOURCE(IDB_WINMERGE), IMAGE_BITMAP,
+ GetSystemMetrics(SM_CXMENUCHECK), GetSystemMetrics(SM_CYMENUCHECK), LR_DEFAULTCOLOR);
}
/// Default destructor, unloads bitmap
@@ -175,7 +181,7 @@
return E_INVALIDARG;
// Sanity check & make sure there is at least one filename.
- UINT uNumFilesDropped = DragQueryFile (hDropInfo, 0xFFFFFFFF, NULL, 0);
+ UINT uNumFilesDropped = DragQueryFile(hDropInfo, 0xFFFFFFFF, NULL, 0);
m_nSelectedItems = uNumFilesDropped;
if (uNumFilesDropped == 0)
@@ -353,7 +359,7 @@
m_strPaths[1] = m_strPaths[0];
m_strPaths[0] = m_strPreviousPath;
bCompare = TRUE;
-
+
// Forget previous selection
if (reg.Open(HKEY_CURRENT_USER, f_RegDir) == ERROR_SUCCESS)
reg.WriteString(f_FirstSelection, _T(""));
@@ -393,17 +399,17 @@
bAlterSubFolders = TRUE;
String strCommandLine = FormatCmdLine(strWinMergePath, m_strPaths[0],
- m_strPaths[1], bAlterSubFolders);
+ m_strPaths[1], bAlterSubFolders);
// Finally start a new WinMerge process
BOOL retVal = FALSE;
STARTUPINFO stInfo = {0};
stInfo.cb = sizeof(STARTUPINFO);
PROCESS_INFORMATION processInfo = {0};
-
+
retVal = CreateProcess(NULL, (LPTSTR)strCommandLine.c_str(),
- NULL, NULL, FALSE, CREATE_DEFAULT_ERROR_MODE, NULL, NULL,
- &stInfo, &processInfo);
+ NULL, NULL, FALSE, CREATE_DEFAULT_ERROR_MODE, NULL, NULL,
+ &stInfo, &processInfo);
if (!retVal)
return S_FALSE;
@@ -419,7 +425,7 @@
CRegKeyEx reg;
if (!reg.QueryRegUser(f_RegDir))
return FALSE;
-
+
// Try first reading debug/test value
strDir = reg.ReadString(f_RegValuePriPath, _T(""));
if (strDir.empty())
@@ -427,7 +433,7 @@
strDir = reg.ReadString(f_RegValuePath, _T(""));
if (strDir.empty())
return FALSE;
- }
+ }
return TRUE;
}
@@ -440,8 +446,8 @@
// Check extension
if (_tcsicmp(sExt.c_str(), _T("exe")) == 0 ||
- _tcsicmp(sExt.c_str(), _T("cmd")) == 0 ||
- _tcsicmp(sExt.c_str(), _T("bat")) == 0)
+ _tcsicmp(sExt.c_str(), _T("cmd")) == 0 ||
+ _tcsicmp(sExt.c_str(), _T("bat")) == 0)
{
// Check if file exists
struct _stati64 statBuffer;
@@ -458,15 +464,15 @@
{
String strMenu = GetResourceString(IDS_CONTEXT_MENU);
InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION, uidFirstCmd, strMenu.c_str());
-
+
// Add bitmap
if (m_MergeBmp != NULL)
SetMenuItemBitmaps(hmenu, uMenuIndex, MF_BYPOSITION, m_MergeBmp, NULL);
-
+
// Show menu item as grayed if more than two items selected
if (m_nSelectedItems > MaxFileCount)
EnableMenuItem(hmenu, uMenuIndex, MF_BYPOSITION | MF_GRAYED);
-
+
return 1;
}
@@ -479,48 +485,48 @@
String strCompareTo = GetResourceString(IDS_COMPARE_TO);
String strReselect = GetResourceString(IDS_RESELECT_FIRST);
int nItemsAdded = 0;
-
+
switch (m_dwMenuState)
{
- // No items selected earlier
- // Select item as first item to compare
+ // No items selected earlier
+ // Select item as first item to compare
case MENU_ONESEL_NOPREV:
InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION, uidFirstCmd,
- strCompareTo.c_str());
+ strCompareTo.c_str());
uMenuIndex++;
uidFirstCmd++;
InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION, uidFirstCmd,
- strCompareEllipsis.c_str());
+ strCompareEllipsis.c_str());
nItemsAdded = 2;
break;
- // One item selected earlier:
- // Allow re-selecting first item or selecting second item
+ // One item selected earlier:
+ // Allow re-selecting first item or selecting second item
case MENU_ONESEL_PREV:
InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION, uidFirstCmd,
- strCompare.c_str());
+ strCompare.c_str());
uMenuIndex++;
uidFirstCmd++;
InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION, uidFirstCmd,
- strReselect.c_str());
+ strReselect.c_str());
nItemsAdded = 2;
break;
- // Two items selected
- // Select both items for compare
+ // Two items selected
+ // Select both items for compare
case MENU_TWOSEL:
InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION, uidFirstCmd,
- strCompare.c_str());
+ strCompare.c_str());
nItemsAdded = 1;
break;
default:
InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION, uidFirstCmd,
- strCompare.c_str());
+ strCompare.c_str());
nItemsAdded = 1;
break;
}
-
+
// Add bitmap
if (m_MergeBmp != NULL)
{
@@ -528,7 +534,7 @@
SetMenuItemBitmaps(hmenu, uMenuIndex - 1, MF_BYPOSITION, m_MergeBmp, NULL);
SetMenuItemBitmaps(hmenu, uMenuIndex, MF_BYPOSITION, m_MergeBmp, NULL);
}
-
+
// Show menu item as grayed if more than two items selected
if (m_nSelectedItems > MaxFileCount)
{
@@ -563,12 +569,12 @@
case MENU_ONESEL_NOPREV:
strHelp = GetResourceString(IDS_HELP_SAVETHIS);
break;
-
+
case MENU_ONESEL_PREV:
strHelp = GetResourceString(IDS_HELP_COMPARESAVED);
string_replace(strHelp, _T("%1"), m_strPreviousPath);
break;
-
+
case MENU_TWOSEL:
strHelp = GetResourceString(IDS_CONTEXT_HELP);
break;
@@ -591,7 +597,7 @@
/// Format commandline used to start WinMerge
String CWinMergeShell::FormatCmdLine(const String &winmergePath,
- const String &path1, const String &path2, BOOL bAlterSubFolders)
+ const String &path1, const String &path2, BOOL bAlterSubFolders)
{
String strCommandline(winmergePath);
@@ -604,9 +610,9 @@
strCommandline += _T(" /r");
else if (!bAlterSubFolders && bSubfoldersByDefault)
strCommandline += _T(" /r");
-
+
strCommandline += _T(" \"") + path1 + _T("\"");
-
+
if (!m_strPaths[1].empty())
strCommandline += _T(" \"") + path2 + _T("\"");
Modified: branches/R2_14/ShellExtension/WinMergeShell.h
===================================================================
--- branches/R2_14/ShellExtension/WinMergeShell.h 2010-10-18 08:58:19 UTC (rev 7313)
+++ branches/R2_14/ShellExtension/WinMergeShell.h 2010-10-18 09:16:32 UTC (rev 7314)
@@ -4,7 +4,7 @@
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or (at
// your option) any later version.
-//
+//
// This program is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -16,7 +16,7 @@
/////////////////////////////////////////////////////////////////////////////
// Look at http://www.codeproject.com/shell/ for excellent guide
// to Windows Shell programming by Michael Dunn.
-/**
+/**
* @file WinMergeShell.h
*
* @brief Declaration file for ShellExtension class
@@ -34,30 +34,30 @@
#include "resource.h" // main symbols
#include "UnicodeString.h"
-/**
+/**
* @brief Class for handling shell extension tasks
*/
-class ATL_NO_VTABLE CWinMergeShell :
- public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CWinMergeShell, &CLSID_WinMergeShell>,
- public IDispatchImpl<IWinMergeShell, &IID_IWinMergeShell, &LIBID_SHELLEXTENSIONLib>,
- public IShellExtInit,
- public IContextMenu
+class ATL_NO_VTABLE CWinMergeShell :
+ public CComObjectRootEx<CComSingleThreadModel>,
+ public CComCoClass<CWinMergeShell, &CLSID_WinMergeShell>,
+ public IDispatchImpl<IWinMergeShell, &IID_IWinMergeShell, &LIBID_SHELLEXTENSIONLib>,
+ public IShellExtInit,
+ public IContextMenu
{
public:
CWinMergeShell();
~CWinMergeShell();
-DECLARE_REGISTRY_RESOURCEID(IDR_WINMERGESHELL)
+ DECLARE_REGISTRY_RESOURCEID(IDR_WINMERGESHELL)
-DECLARE_PROTECT_FINAL_CONSTRUCT()
+ DECLARE_PROTECT_FINAL_CONSTRUCT()
-BEGIN_COM_MAP(CWinMergeShell)
+ BEGIN_COM_MAP(CWinMergeShell)
COM_INTERFACE_ENTRY(IWinMergeShell)
COM_INTERFACE_ENTRY(IDispatch)
COM_INTERFACE_ENTRY(IShellExtInit)
COM_INTERFACE_ENTRY(IContextMenu)
-END_COM_MAP()
+ END_COM_MAP()
// IWinMergeShell
protected:
@@ -74,16 +74,16 @@
int DrawAdvancedMenu(HMENU hmenu, UINT uMenuIndex, UINT uidFirstCmd);
String GetHelpText(UINT_PTR idCmd);
String FormatCmdLine(const String &winmergePath,
- const String &path1, const String &path2, BOOL bAlterSubFolders);
+ const String &path1, const String &path2, BOOL bAlterSubFolders);
public:
- // IShellExtInit
- STDMETHOD(Initialize)(LPCITEMIDLIST, LPDATAOBJECT, HKEY);
+ // IShellExtInit
+ STDMETHOD(Initialize)(LPCITEMIDLIST, LPDATAOBJECT, HKEY);
- // IContextMenu
- STDMETHOD(GetCommandString)(UINT_PTR, UINT, UINT*, LPSTR, UINT);
- STDMETHOD(InvokeCommand)(LPCMINVOKECOMMANDINFO);
- STDMETHOD(QueryContextMenu)(HMENU, UINT, UINT, UINT, UINT);
+ // IContextMenu
+ STDMETHOD(GetCommandString)(UINT_PTR, UINT, UINT*, LPSTR, UINT);
+ STDMETHOD(InvokeCommand)(LPCMINVOKECOMMANDINFO);
+ STDMETHOD(QueryContextMenu)(HMENU, UINT, UINT, UINT, UINT);
};
#endif //__WINMERGESHELL_H_
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-18 08:58:25
|
Revision: 7313
http://winmerge.svn.sourceforge.net/winmerge/?rev=7313&view=rev
Author: gerundt
Date: 2010-10-18 08:58:19 +0000 (Mon, 18 Oct 2010)
Log Message:
-----------
Drop "Denis Bradford" as normal contributor in Contributors.txt in R2_14
Modified Paths:
--------------
branches/R2_14/Docs/Users/Contributors.txt
Modified: branches/R2_14/Docs/Users/Contributors.txt
===================================================================
--- branches/R2_14/Docs/Users/Contributors.txt 2010-10-18 08:56:46 UTC (rev 7312)
+++ branches/R2_14/Docs/Users/Contributors.txt 2010-10-18 08:58:19 UTC (rev 7313)
@@ -142,7 +142,6 @@
Other Contributors (code, ideas, testing..):
* Andre Arpin
* Steve Beaudoin
-* Denis Bradford
* Adam Carrivick
* Hern Chen
* Jeremy Dewey
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-18 08:56:52
|
Revision: 7312
http://winmerge.svn.sourceforge.net/winmerge/?rev=7312&view=rev
Author: gerundt
Date: 2010-10-18 08:56:46 +0000 (Mon, 18 Oct 2010)
Log Message:
-----------
PATCH: [ 3042393 ] add ascx to Highlightsyntax ASP
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/Src/editlib/ccrystaltextview.cpp
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-17 15:58:28 UTC (rev 7311)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-18 08:56:46 UTC (rev 7312)
@@ -5,6 +5,7 @@
WinMerge 2.13.19
Add missing keywords to Pascal highlighter (#2834192)
+ Recognize .ascx files as ASP files (#3042393)
Fix help locations (#2988974)
New translation: Persian (#2877121, #3065119)
New translation: Serbian (#3017674, #3065119)
Modified: branches/R2_14/Src/editlib/ccrystaltextview.cpp
===================================================================
--- branches/R2_14/Src/editlib/ccrystaltextview.cpp 2010-10-17 15:58:28 UTC (rev 7311)
+++ branches/R2_14/Src/editlib/ccrystaltextview.cpp 2010-10-18 08:56:46 UTC (rev 7312)
@@ -272,7 +272,7 @@
CCrystalTextView::TextDefinition CCrystalTextView::m_SourceDefs[] =
{
CCrystalTextView::SRC_PLAIN, _T ("Plain"), _T ("txt,doc,diz"), &CCrystalTextView::ParseLinePlain, SRCOPT_AUTOINDENT, /*4,*/ _T (""), _T (""), _T (""), (DWORD)-1,
- CCrystalTextView::SRC_ASP, _T ("ASP"), _T ("asp"), &CCrystalTextView::ParseLineAsp, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T (""), _T (""), _T ("'"), (DWORD)-1,
+ CCrystalTextView::SRC_ASP, _T ("ASP"), _T ("asp,ascx"), &CCrystalTextView::ParseLineAsp, SRCOPT_AUTOINDENT|SRCOPT_BRACEANSI, /*2,*/ _T (""), _T (""), _T ("'"), (DWORD)-1,
CCrystalTextView::SRC_BASIC, _T ("Basic"), _T ("bas,vb,vbs,frm,dsm,cls,ctl,pag,dsr"), &CCrystalTextView::ParseLineBasic, SRCOPT_AUTOINDENT, /*4,*/ _T (""), _T (""), _T ("\'"), (DWORD)-1,
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,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2010-10-17 15:58:35
|
Revision: 7311
http://winmerge.svn.sourceforge.net/winmerge/?rev=7311&view=rev
Author: christianlist
Date: 2010-10-17 15:58:28 +0000 (Sun, 17 Oct 2010)
Log Message:
-----------
PATCH: [ 3088720 ] Add OpenCandy to the InnoSetup installer
This is using the OpenCandy 1.4.2.28 Inno SDK.
The WinMerge.iss is including a file OpenCandyKeys.iss which is not included. This file contains the private keys for WinMerge, and can be obtained from the WinMerge administrators if you are creating the WinMerge releases.
If you just want to use the installer without the WinMerge keys, then remove this line:
#include <OpenCandyKeys.iss>
This makes the installer compile with default demo keys instead of the WinMerge specific keys.
Modified Paths:
--------------
trunk/Docs/Users/GPL.rtf
trunk/Installer/InnoSetup/WinMerge.iss
Added Paths:
-----------
trunk/Installer/InnoSetup/OCSetupHlp.dll
trunk/Installer/InnoSetup/OCSetupHlp.iss
trunk/Installer/InnoSetup/OpenCandy_Why_Is_This_Here.txt
Modified: trunk/Docs/Users/GPL.rtf
===================================================================
(Binary files differ)
Added: trunk/Installer/InnoSetup/OCSetupHlp.dll
===================================================================
(Binary files differ)
Property changes on: trunk/Installer/InnoSetup/OCSetupHlp.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Installer/InnoSetup/OCSetupHlp.iss
===================================================================
--- trunk/Installer/InnoSetup/OCSetupHlp.iss (rev 0)
+++ trunk/Installer/InnoSetup/OCSetupHlp.iss 2010-10-17 15:58:28 UTC (rev 7311)
@@ -0,0 +1,803 @@
+;---------------------------------------------------------------------------;
+; OCSetupHlp.iss ;
+;---------------------------------------------------------------------------;
+; ;
+; Header file for OpenCandy integration ;
+; with Inno Setup 5 projects and files. ;
+; ;
+;---------------------------------------------------------------------------;
+
+;
+; OpenCandy Defines
+; -----------------
+;
+; Used to abstract file names.
+;
+
+#define OCDLL "OCSetupHlp.dll"
+#define OCREADME "OpenCandy_Why_Is_This_Here.txt"
+
+[Code]
+
+#ifdef UNICODE
+type OCString = AnsiString;
+#else
+type OCString = String;
+#endif
+
+
+//
+// OpenCandy Global Variables
+// --------------------------
+//
+
+var
+
+ bDetached:boolean; // Used to keep track of offer page state
+ UseOfferPage: Boolean; // Used to know if we should shown an offer
+ OfferAccepted: Boolean; // Used to keep track of the user selection
+ OCOfferPage: TWizardPage; // Handle to the offer page wizard page
+ OCNOCANDY: Boolean; // Used to keep track of /NOCANDY parameter
+ ProductKey: OCString; // Used to store the product key
+ GoodOS: Boolean; // Used to store the results of the OS check
+ SignalSent: Boolean; // Used to keep track or server comm
+ GetOffersCalled: Boolean; // Used to keep track of the first call
+ ProductFailed: Boolean; // Keeps track of errors that may occur during product installation, so we can signal the DLL on failure
+ OffersReady: Boolean; // Set to false if offers are not ready in time
+
+//
+// OpenCandy DLL (OCSetupHlp) function declarations
+// ------------------------------------------------
+//
+// These functions are exported from OCSetupHlp.dll
+// and used throughout the setup to perform the operations
+// needed for the display of the offer page
+//
+
+function OCInit(a,b,c,d,e:OCString; f,bAsyncMode:Boolean): Integer;
+external 'OCInit2A@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+function OCGetBannerInfo(a,b:OCString):Integer;
+external 'OCGetBannerInfo@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+function OCRunPage(hwnd,r,g,b:Integer): Integer;
+external 'OCRunDialog@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+function OCAdjustPage(hwnd,x,y,w,h : Integer): Integer;
+external 'OCInnoAdjust@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+function OCRestorePage(hwnd:Integer): Integer;
+external 'OCInnoRestore@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+function OCGetOfferState(): Integer;
+external 'OCGetOfferState@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+function OCGetOfferType(cmdline:OCString): Integer;
+external 'OCGetOfferType@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+function OCFinish(Mgr:OCString):Integer;
+external 'OCExecuteOffer@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+function OCShutdown(): Integer;
+external 'OCShutdown@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+function OCDetach(): Integer;
+external 'OCDetach@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+function OCSignalProductInstalled():Integer;
+external 'OCSignalProductInstalled@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+function OCSetOfferLocation(location,OID,PID:OCString):Integer;
+external 'OCSetOfferLocation@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+function OCGetMsg(a,b:OCString):Integer;
+external 'OCGetMsg@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+function OCSignalProductFailed():Integer;
+external 'OCSignalProductFailed@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+// Checks if offers are ready or not.
+// 0 = Offers are ready to show
+// 1 = Offers are not ready, but might be. try waiting a little while
+// 2 = Offers are not ready, but might be. the delay could be long though.
+// 3 = No offers available
+function OpenCandyAreOffersReady():Integer;
+external 'OCGetAsyncOfferStatus@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+//
+// String manipulation function declaration from Kernel32.dll
+// We use those to convert from UTF-8 to unicode and other codepages
+//
+
+Function MultiByteToWideChar(CodePage: UINT; dwFlags: DWORD;
+ lpMultiByteStr: OCString; cbMultiByte: integer;
+ lpWideCharStr: String; cchWideChar: integer): longint;
+external 'MultiByteToWideChar@kernel32.dll stdcall';
+
+Function WideCharToMultiByte(CodePage: UINT; dwFlags: DWORD;
+ lpWideCharStr: String; cchWideChar: integer;
+ lpMultiByteStr: OCString; cbMultiByte: integer;
+ lpDefaultChar: integer; lpUsedDefaultChar: integer): longint;
+external 'WideCharToMultiByte@kernel32.dll stdcall';
+
+//
+// Internal OpenCandy Helper Functions
+// -----------------------------------
+//
+// These functions are for internal use ONLY
+//
+
+//
+// ConvertUtf8ToCodePage()
+// -----------------------
+//
+// Internal function used to convert
+// the i18n messages we get from the DLL
+// into a given codepage for diplay in
+// the ASCII version of Inno
+//
+//
+
+function ConvertUtf8ToCodePage(strSource: OCString; codePage: UINT): OCString;
+var
+ nRet: integer;
+ WideCharBuf: OCString;
+ MultiByteBuf: OCString;
+
+begin
+ strSource := strSource + chr(0);
+ SetLength( WideCharBuf, Length( strSource ) * 2 );
+ SetLength( MultiByteBuf, Length( strSource ) * 3 );
+
+ // CP_UTF8 is 65001
+ nRet := MultiByteToWideChar(65001, 0, strSource, -1, WideCharBuf, Length(WideCharBuf));
+ nRet := WideCharToMultiByte(codePage, 0, WideCharBuf, -1, MultiByteBuf, Length(MultiByteBuf), 0, 0);
+
+ if(nRet = 0) then
+ begin
+ // Try with CP_ACP (ASCII)
+ WideCharToMultiByte(0, 0, WideCharBuf, -1, MultiByteBuf, Length(MultiByteBuf), 0, 0);
+ end;
+
+ Result := MultiByteBuf;
+end;
+
+//
+// ConvertUtf8ToUnicode()
+// -----------------------
+//
+// Internal function used to convert
+// the i18n messages we get from the DLL
+// into Unicode from UTF8
+//
+//
+
+function ConvertUtf8ToUnicode(strSource: OCString): String;
+var
+ nRet: integer;
+ WideCharBuf: String;
+begin
+ strSource := strSource + chr(0);
+ SetLength(WideCharBuf, Length(strSource)*2);
+
+ // CP_UTF8 is 65001
+ nRet := MultiByteToWideChar(65001, 0, strSource, -1, WideCharBuf, Length(WideCharBuf));
+
+ Result := WideCharBuf;
+end;
+
+
+
+// OpenCandyDetectOS()
+// -------------------
+//
+// Internal Operating System version
+// detection code, used to rule out
+// operation on Windows 2000 and below
+//
+
+procedure OpenCandyDetectOS();
+var
+ WindowsInfo: TWindowsVersion;
+begin
+ GoodOS := False;
+
+ GetWindowsVersionEx(WindowsInfo);
+ if WindowsInfo.NTPlatform and
+ ((WindowsInfo.Major > 5) or
+ ((WindowsInfo.Major = 5) and (WindowsInfo.minor > 0) )) then
+ begin
+ GoodOS := True;
+ end;
+end;
+
+//
+// External OpenCandy API Functions
+// -----------------------------------
+//
+// These functions are for use in your setup
+//
+
+//
+// OpenCandyInitRemnant()
+// ----------------------
+//
+// This function initializes the OpenCandy sytem. This function takes
+// and extra argument compared to OpenCandyInit() (dontShowOC:boolean)
+// that controls whrether an offer page is shown or not. This function
+// is for using with installations where a primary offer can be shown
+// in place of the OpenCandy offer.
+//
+
+
+procedure OpenCandyInitRemnant2(publisher: OCString;
+ key: OCString;
+ secret: OCString;
+ language: OCString;
+ location: OCString;
+ dontShowOC: boolean;
+ bUseAsyncMode: boolean);
+var
+ retval:integer;
+ i:integer;
+ title:OCString;
+ description:OCString;
+ OID: OCString;
+ uDesc: String;
+ uTitle: String;
+
+begin
+ // Set ProductInstalled to True once entire product install completes.
+ ProductFailed := False;
+ bDetached := True;
+ ProductKey := key;
+ OCNOCANDY := False;
+ OfferAccepted := False;
+ SignalSent := False;
+ UseOfferPage := False;
+ GetOffersCalled := False;
+ OffersReady := True;
+
+ OpenCandyDetectOS();
+
+ if GoodOS = False then Exit;
+ for i := 0 to ParamCount() do
+ begin;
+ if CompareText(ParamStr(i), '/NOCANDY') = 0 then
+ begin
+ OCNOCANDY := True;
+ if( i > 1) then
+ begin;
+ OID:=ParamStr(i-1);
+ retval:=OCSetOfferLocation(location,OID,key);
+ end;
+ end;
+ if CompareText(ParamStr(i), '/SILENT') = 0 then
+ begin
+ OCNOCANDY := True;
+ end;
+ if CompareText(ParamStr(i), '/VERYSILENT') = 0 then
+ begin
+ OCNOCANDY := True;
+ end;
+ end;
+
+ if(OCNOCANDY <> True) and (dontShowOC <> True) then
+ begin
+ retval := OCInit(publisher, key, secret, language, location, false,bUseAsyncMode);
+
+ GetOffersCalled := True;
+
+ if retval = 0 then
+ begin
+
+ UseOfferPage := True;
+ title:=StringOfChar(' ',512);
+ description:=StringOfChar(' ',512);
+ retval:= OCGetBannerInfo(title,description);
+ if retval = 1 then
+ begin
+ description:='';
+ end;
+ if retval = 2 then
+ begin
+ title :='';
+ end;
+ if (retval = -1) OR (retval=0) then
+ begin
+ description:='blah';
+ title :='blah';
+ end;
+
+ #ifdef UNICODE
+ uDesc := ConvertUtf8ToUnicode(description);
+ uTitle := ConvertUtf8ToUnicode(title);
+ OCOfferPage := CreateCustomPage(wpSelectTasks, uTitle, uDesc);
+ #else
+ description := ConvertUtf8ToCodePage(description, GetUILanguage());
+ title := ConvertUtf8ToCodePage(title, GetUILanguage());
+ OCOfferPage := CreateCustomPage(wpSelectTasks, title, description);
+ #endif
+
+
+ end;
+ end;
+end;
+
+
+procedure OpenCandyInitRemnant(key: OCString;
+ secret: OCString;
+ language: OCString;
+ location: OCString;
+ dontShowOC: boolean);
+begin
+ OpenCandyInitRemnant2('', key, secret, language, location, dontShowOC, False);
+end;
+
+
+//
+// OpenCandyInit()
+// ---------------
+//
+// These function initializes the OpenCandy system.
+// It calls the OpenCandyInitRemnant() function with
+// the last parameter set to False, so that the offer
+// page will be shown (if available). This is the
+// normal scenario.
+
+// Includes publisher parameter
+procedure OpenCandyInit2(publisher: OCString;
+ key: OCString;
+ secret: OCString;
+ language: OCString;
+ location: OCString;
+ bUseAsyncMode: Boolean);
+begin
+ OpenCandyInitRemnant2(publisher,
+ key,
+ secret,
+ language,
+ location,
+ False,
+ bUseAsyncMode);
+end;
+
+// Use server setting
+procedure OpenCandyInit(publisher: OCString;
+ key: OCString;
+ secret: OCString;
+ language: OCString;
+ location: OCString);
+begin
+ OpenCandyInitRemnant2(publisher,
+ key,
+ secret,
+ language,
+ location,
+ False,
+ False);
+end;
+
+
+
+//
+// OpenCandyShouldSkipPage()
+// -------------------------
+//
+// Checks if page should be skipped
+//
+
+
+function OpenCandyShouldSkipPage(CurPageID: Integer) : Boolean;
+var
+ retval: Integer;
+ nOffersState: Integer;
+begin
+
+ if GoodOS = false then Exit;
+
+ if UseOfferPage = True then
+ begin
+ if CurPageID = OCOfferPage.ID then
+ begin
+ if OffersReady = False then
+ begin
+ Result := True;
+ //MsgBox('OpenCandyShouldSkipPage', mbInformation, MB_OK);
+ Exit;
+ end;
+ if bDetached = True then
+ begin
+ Result := True;
+ bDetached := False;
+ OffersReady := False;
+ //MsgBox('ShouldSkipPage', mbInformation, MB_OK);
+ retval := OCRunPage(OCOfferPage.Surface.Handle,240,240,240);
+ if retval <> -1 then
+ begin
+ Result := False;
+ OffersReady := True;
+ //MsgBox('Not skipping Page', mbInformation, MB_OK);
+ end;
+ if retval = -1 then
+ begin
+ //MsgBox('OpenCandyShouldSkipPage', mbInformation, MB_OK);
+ end;
+ end;
+ end;
+ end;
+end;
+
+//
+// OpenCandyCurPageChanged()
+// -------------------------
+//
+// This function is to be called from CurPageChanged()
+// It makes sure to run the OpenCandy offer page when it
+// is time to run it.
+//
+
+procedure OpenCandyCurPageChanged(CurPageID: Integer);
+var
+ retval: Integer;
+begin
+ if GoodOS = false then Exit;
+ if OffersReady = False then
+ begin
+ Exit;
+ end;
+
+ if UseOfferPage = True then
+ begin
+ if CurPageID = OCOfferPage.ID then
+ begin
+ retval := OCAdjustPage(OCOfferPage.Surface.Handle,12,70,480,300);
+ end;
+ end;
+end;
+
+//
+// OpenCandyNextButtonClick()
+// --------------------------
+//
+// This function should be called from NextButtonClick()
+// It handles the logic of the Offer page, making
+// sure a selection was made (offer or no offer) before.
+//
+
+function OpenCandyNextButtonClick(CurPageID: Integer): Boolean;
+var
+ retval: Integer;
+ getmsg: Integer;
+ shouldContinue: Boolean;
+ msgText: OCString;
+ uMsg: String;
+begin
+ shouldContinue := True;
+
+ if GoodOS = false then
+ begin
+ Result := shouldContinue;
+ Exit;
+ end;
+
+ if UseOfferPage = True then
+ begin
+ if CurPageID = OCOfferPage.ID then
+ begin
+
+ retval := OCGetOfferState();
+
+ if( retval < 0) then
+ begin
+ msgText := StringOfChar(' ', 1024);
+ getmsg := OCGetMsg('PleaseChoose', msgText);
+#ifdef UNICODE
+ uMsg := ConvertUtf8ToUnicode(msgText);
+ MsgBox(uMsg, mbInformation, MB_OK);
+#else
+ msgText := ConvertUtf8ToCodePage(msgText, GetUILanguage());
+ MsgBox(msgText, mbInformation, MB_OK);
+#endif
+ shouldContinue := False;
+ end;
+
+ if(retval >= 0) then
+ begin
+
+ OfferAccepted := False;
+ if(retval = 1) then
+ begin
+ OfferAccepted := True;
+ end;
+ //MsgBox('OCRestorePage 1', mbInformation, MB_OK);
+ retval := OCRestorePage(OCOfferPage.Surface.Handle);
+ shouldContinue := True;
+ end;
+
+ end;
+ end;
+
+ Result := shouldContinue;
+end;
+
+//
+// OpenCandyBackButtonClick()
+// --------------------------
+//
+// This function should be called from BackButtonClick().
+// It restores the layout of the installer window for
+// other pages to use.
+//
+
+function OpenCandyBackButtonClick(CurPageID: Integer): Boolean;
+begin
+ if GoodOS = false then
+ begin
+ Result := True;
+ Exit;
+ end;
+
+ if UseOfferPage = True then
+ begin
+ if CurPageID = OCOfferPage.ID then
+ begin
+ //MsgBox('OCRestorePage 2', mbInformation, MB_OK);
+ OCRestorePage(OCOfferPage.Surface.Handle);
+ end;
+ end;
+
+ Result := True;
+end;
+
+//
+// OpenCandyDeinitializeSetup()
+// ----------------------------
+//
+// This should be called from DeinitializeSetup()
+// It cleans up the temporarily loaded DLL and releases
+// the memory we have been using (if any).
+//
+
+procedure OpenCandyDeinitializeSetup();
+var
+retval:integer;
+begin
+ if GoodOS = false then Exit;
+
+ if UseOfferPage = True then
+ begin
+ if ProductFailed = True then
+ begin
+ retval := OCSignalProductFailed();
+ end;
+
+ if bDetached = False then
+ begin
+ bDetached:=True;
+ retval:=OCDetach();
+ end;
+ OCShutdown();
+ end;
+
+end;
+
+//
+// OpenCandyCurStepChanged()
+// -------------------------
+//
+// This should be called from CurStepChanged().
+//
+// It handles necesary operations at the various
+// different stages of the setup.
+//
+
+procedure OpenCandyCurStepChanged(CurStep: TSetupStep);
+var
+ retval: Integer;
+ s,s2: OCString;
+ cmdline: OCString;
+begin
+ if CurStep = ssInstall then
+ begin
+ // Set to true in case it fails.
+ ProductFailed:= True;
+ end;
+ if CurStep = ssPostInstall then
+ begin
+ ProductFailed:= False;
+ end;
+
+
+
+ if GoodOS = false then Exit;
+
+ // Install Step
+
+ if CurStep = ssInstall then
+ begin
+ if UseOfferPage = True then
+ begin
+ if bDetached = False then
+ begin
+ bDetached := True;
+ retval := OCDetach();
+ end;
+ end;
+ end;
+
+ // Post Install Step
+
+ if CurStep = ssPostInstall then
+ begin
+ if OCNOCANDY = False then
+ begin
+ if UseOfferPage = True then
+ begin
+ cmdline := StringOfChar(' ',1024);
+ retval := OCGetOfferType(cmdline);
+
+ if retval = 1 then // OC_OFFER_TYPE_NORMAL
+ begin
+ s := ExpandConstant('{app}') + '\OpenCandy\{#OCDLL}';
+ s := GetShortName(s);
+ s2 := s + ',_MgrCheck@16';
+ retval:=OCFinish(s2);
+ end;
+ end;
+ end;
+ end;
+
+ // Install Done Step
+
+ if CurStep = ssDone then
+ begin
+ if (OCNOCANDY = False) and (GetOffersCalled = True) then
+ begin
+ // Product was installed so let's signal it
+
+ retval := OCSignalProductInstalled();
+
+ // Check if offer was accepted
+ if (OfferAccepted = True) then
+ begin
+
+ cmdline := StringOfChar(' ',1024);
+ retval := OCGetOfferType(cmdline);
+
+ if retval = 1 then // OC_OFFER_TYPE_NORMAL
+ begin
+ // Offer was accepted, let's run
+ s := ExpandConstant('{app}') + '\OpenCandy\OCSetupHlp.Dll';
+ s := GetShortName(s);
+ s := s + ',_MgrCheck@16';
+ s:='RunDll32.exe ' + s;
+ Exec('>', s, '', SW_SHOW, ewNoWait, retval);
+ end;
+ end;
+ end;
+ end;
+end;
+
+//
+// OpenCandyProcessEmbedded()
+// --------------------------
+//
+// This function should NOT be called
+// directly. It serves as an installation
+// handle for the OCDLL file (see the Files
+// section in the main setup script)
+//
+
+procedure OpenCandyProcessEmbedded();
+var
+ retval: Integer;
+ str: OCString;
+ cmdline: OCString;
+ params: OCString;
+ tmp: OCString;
+ ResultCode: Integer;
+begin
+ if GoodOS = false then Exit;
+
+ if UseOfferPage = True then
+ begin
+ cmdline := StringOfChar(' ',1024);
+ retval := OCGetOfferType(cmdline);
+ if retval = 2 then // OC_OFFER_TYPE_EMBEDDED
+ begin
+
+ str := ExpandConstant('{app}') + '\OpenCandy\{#OCDLL}';
+ str := GetShortName(str);
+ str := str + ',_MgrCheck@16';
+ retval:=OCFinish(str);
+
+ if(OfferAccepted = True) then
+ begin
+ str := 'RunDll32.exe ' + str;
+
+ // The DLL does not append a \0 since inno chokes on it, so we need to trim the string back down.
+ tmp := TrimRight(cmdline);
+ params := tmp + ' /S' + ProductKey;
+
+ str := str + params;
+ Exec('>', str, '', SW_HIDE, ewWaitUntilTerminated, ResultCode);
+ end;
+
+ end;
+ end;
+end;
+
+//
+// OpenCandyCheckInstallDLL()
+// --------------------------
+//
+// This function should NOT be called
+// directly. It serves as an installation
+// check for the OCDLL files (see the Files
+// section in the main setup script)
+//
+
+function OpenCandyCheckInstallDLL(): Boolean;
+var
+ str: OCString;
+ retval: Integer;
+ cmdline: OCString;
+begin
+
+ Result := False;
+
+ if GoodOS = false then Exit;
+
+ if (UseOfferPage = True) and (OCNOCANDY = False) then
+ begin
+ if (OfferAccepted = False) and (SignalSent = False) then
+ begin
+ cmdline := StringOfChar(' ',1024);
+ retval := OCGetOfferType(cmdline);
+
+ if retval = 2 then // OC_OFFER_TYPE_EMBEDDED
+ begin
+ // We won't install the DLL but
+ // we still need to call OCFinish()
+
+ str := ExpandConstant('{app}') + '\OpenCandy\{#OCDLL}';
+ str := GetShortName(str);
+ str := str + ',_MgrCheck@16';
+ OCFinish(str);
+ SignalSent := True;
+ end;
+ end;
+ end;
+
+ Result := OfferAccepted;
+end;
+
+//
+// OpenCandyCheckInstallReadme()
+// -----------------------------
+//
+// This function should NOT be called
+// directly. It serves as an installation
+// check for the OCREADME file (see the Files
+// section in the main setup script)
+//
+
+function OpenCandyCheckInstallReadme(): Boolean;
+begin
+ Result := OfferAccepted;
+end;
+
+//---------------------------------------------------------------------------//
+// End of File //
+//---------------------------------------------------------------------------//
+
+
+
+
+
+
+
+
+
+
Added: trunk/Installer/InnoSetup/OpenCandy_Why_Is_This_Here.txt
===================================================================
--- trunk/Installer/InnoSetup/OpenCandy_Why_Is_This_Here.txt (rev 0)
+++ trunk/Installer/InnoSetup/OpenCandy_Why_Is_This_Here.txt 2010-10-17 15:58:28 UTC (rev 7311)
@@ -0,0 +1,52 @@
+What is OpenCandy?
+
+OpenCandy is a platform and network which enables software publishers
+to recommend other products, during installation of their software, they
+believe you will find valuable.
+
+So\x85 What is this folder, its contents, and why is it here?
+
+These files are only on your computer because you accepted a software
+recommendation. These files are TEMPORARILY copied to a folder within
+the publisher's program files directory until the recommended software
+is downloaded and installation is performed.
+
+This folder contains:
+
+ * OpenCandy_Why_Is_This_Here.txt
+ - This text file you\x92re reading. :)
+
+ * OCSetupHlp.dll
+ - This file is used to display a recommendation during the
+ publisher\x92s software installation and to facilitate the download
+ and installation of the recommended software. This file also
+ allows us to provide software publishers with *non personally
+ identifiable* information such as statistics like install
+ initiated and completed, country, operating system and language,
+ and whether the software recommendation was accepted or not.
+
+After the recommended software\x92s installation is started (and regardless
+of whether it is successfully completed) these files and the 'OpenCandy'
+folder will be automatically deleted next time the system is restarted.
+
+The possible reasons this folder and its contents remain are:
+
+ A) You rebooted before installing the recommend software
+ B) You lost power before the recommended software was installed
+ C) Your computer exploded before the recommended software was
+ installed (Then how are you reading this?)
+
+Feel free to delete this OpenCandy folder (and its contents) at any
+time; there is no harm in doing so. If you believe this folder and its
+files should have been deleted and were not (and neither A, B, or C
+happened), we'd appreciate if you contacted us (see below) and told us
+what you think happened. If it happens to be a bug, we'll fix it so this
+doesn't happen to anyone else. Oh yeah, and we'll send you an awesome
+purple t-shirt for helping us out!
+
+If you have any questions, please don\x92t hesitate to contact us at
+www.opencandy.com/contact/.
+
+Thank you.
+
+- The OpenCandy team
\ No newline at end of file
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2010-10-17 15:38:25 UTC (rev 7310)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2010-10-17 15:58:28 UTC (rev 7311)
@@ -52,7 +52,33 @@
#define RuntimesX86Installer "..\..\..\Runtimes\vcredist_x86.exe"
#define RuntimesX64Installer "..\..\..\Runtimes\vcredist_x64.exe"
+; OpenCandy includes and defines
+#include <OCSetupHlp.iss>
+// The OpenCandyKeys.iss file contains the WinMerge specific OpenCandy keys.
+// The file can be obtained from the WinMerge administrators.
+// Remove the next line to use the demo keys only.
+#include <OpenCandyKeys.iss>
+
+#define OC_STR_MY_PRODUCT_NAME "WinMerge"
+
+// Note: These keys are demo keys only, the WinMerge keys are kept somewhere else
+#ifndef OC_STR_KEY
+ #define OC_STR_KEY "1401d0bd8048e1f0f4628dbec1a73092"
+#endif
+#ifndef OC_STR_SECRET
+ #define OC_STR_SECRET "4564bdaf826bbe2115718d1643ecc19e"
+#endif
+
+#define OC_STR_REGISTRY_PATH "Software\Thingamahoochie\OpenCandy"
+
+#if OC_STR_KEY == "1401d0bd8048e1f0f4628dbec1a73092"
+ #pragma warning "Do not forget to change the test key '1401d0bd8048e1f0f4628dbec1a73092' to your company's product key before releasing this installer."
+#endif
+#if OC_STR_SECRET == "4564bdaf826bbe2115718d1643ecc19e"
+ #pragma warning "Do not forget to change the test secret '4564bdaf826bbe2115718d1643ecc19e' to your company's product secret before releasing this installer."
+#endif
+
[Setup]
AppName=WinMerge
AppVersion={#AppVersion}
@@ -155,7 +181,7 @@
English.FinishedLabel=Setup has finished installing WinMerge on your computer.
English.SetupAppTitle=Setup - WinMerge {#AppVersion}
English.WizardInfoBefore=License Agreement
-English.InfoBeforeLabel=GNU General Public License
+English.InfoBeforeLabel=GNU General Public License & OpenCandy EULA
[Types]
@@ -451,6 +477,11 @@
Source: ..\..\Plugins\dlls\editor addin.sct; DestDir: {app}\MergePlugins; Flags: IgnoreVersion CompareTimeStamp; Components: Plugins
Source: ..\..\Plugins\dlls\insert datetime.sct; DestDir: {app}\MergePlugins; Flags: IgnoreVersion CompareTimeStamp; Components: Plugins
+; OPEN CANDY START
+Source: {#OCREADME}; DestDir: {app}\OpenCandy; Flags: overwritereadonly ignoreversion; Check: OpenCandyCheckInstallReadme
+Source: {#OCDLL}; DestDir: {app}\OpenCandy; Flags: overwritereadonly ignoreversion; Check: OpenCandyCheckInstallDLL; AfterInstall: OpenCandyProcessEmbedded
+; OPEN CANDY END
+
[Icons]
;Start Menu Icons
Name: {group}\WinMerge; Filename: {app}\{code:ExeName}
@@ -965,6 +996,9 @@
If CurPage = wpInstalling Then
{Delete the previous start menu group if the location has changed since the last install}
DeletePreviousStartMenu;
+ // OPEN CANDY START
+ OpenCandyCurPageChanged(CurPage);
+ // OPEN CANDY END
End;
// Checks if context menu is already enabled for shell extension
@@ -1083,6 +1117,9 @@
IntegrateClearCase('..\..\bin\cleardiffmrg.exe', WinMergeExeName());
end;
end;
+ // OPEN CANDY START
+ OpenCandyCurStepChanged(CurStep);
+ // OPEN CANDY END
End;
Procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
@@ -1104,3 +1141,139 @@
IntegrateClearCase(WinMergeExeName(), '..\..\bin\cleardiffmrg.exe');
end;
End;
+
+procedure InitializeWizard;
+Var OCstrInstallerLanguage: String;
+begin
+ // OPEN CANDY START
+ // Convert the internal language name to an ISO 639-1 code. Find a list at http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
+ Case ActiveLanguage of
+ 'default' : Begin
+ OCstrInstallerLanguage := 'en';
+ End;
+ 'English' : Begin
+ OCstrInstallerLanguage := 'en';
+ End;
+ 'Bulgarian' : Begin
+ OCstrInstallerLanguage := 'bg';
+ End;
+ 'Catalan' : Begin
+ OCstrInstallerLanguage := 'ca';
+ End;
+ 'Chinese_Simplified' : Begin
+ OCstrInstallerLanguage := 'zh';
+ End;
+ 'Chinese_Traditional' : Begin
+ OCstrInstallerLanguage := 'zh';
+ End;
+ 'Croatian' : Begin
+ OCstrInstallerLanguage := 'hr';
+ End;
+ 'Czech' : Begin
+ OCstrInstallerLanguage := 'cs';
+ End;
+ 'Danish' : Begin
+ OCstrInstallerLanguage := 'da';
+ End;
+ 'Dutch' : Begin
+ OCstrInstallerLanguage := 'nl';
+ End;
+ 'French' : Begin
+ OCstrInstallerLanguage := 'fr';
+ End;
+ 'Galician' : Begin
+ OCstrInstallerLanguage := 'gl';
+ End;
+ 'German' : Begin
+ OCstrInstallerLanguage := 'de';
+ End;
+ 'Greek' : Begin
+ OCstrInstallerLanguage := 'el';
+ End;
+ 'Hungarian' : Begin
+ OCstrInstallerLanguage := 'hu';
+ End;
+ 'Italian' : Begin
+ OCstrInstallerLanguage := 'it';
+ End;
+ 'Japanese' : Begin
+ OCstrInstallerLanguage := 'ja';
+ End;
+ 'Korean' : Begin
+ OCstrInstallerLanguage := 'ko';
+ End;
+ 'Norwegian' : Begin
+ OCstrInstallerLanguage := 'no';
+ End;
+ 'Persian' : Begin
+ OCstrInstallerLanguage := 'fa';
+ End;
+ 'Polish' : Begin
+ OCstrInstallerLanguage := 'pl';
+ End;
+ 'Portuguese' : Begin
+ OCstrInstallerLanguage := 'pt';
+ End;
+ 'PortugueseBrazilian' : Begin
+ OCstrInstallerLanguage := 'pt';
+ End;
+ 'Romanian' : Begin
+ OCstrInstallerLanguage := 'ro';
+ End;
+ 'Russian' : Begin
+ OCstrInstallerLanguage := 'ru';
+ End;
+ 'Serbian' : Begin
+ OCstrInstallerLanguage := 'sr';
+ End;
+ 'Slovak' : Begin
+ OCstrInstallerLanguage := 'sk';
+ End;
+ 'Slovenian' : Begin
+ OCstrInstallerLanguage := 'sl';
+ End;
+ 'Spanish' : Begin
+ OCstrInstallerLanguage := 'es';
+ End;
+ 'Swedish' : Begin
+ OCstrInstallerLanguage := 'sv';
+ End;
+ 'Turkish' : Begin
+ OCstrInstallerLanguage := 'tr';
+ End;
+ 'Ukrainian' : Begin
+ OCstrInstallerLanguage := 'uk';
+ End;
+ End; {End Case}
+ OpenCandyInit('{#OC_STR_MY_PRODUCT_NAME}','{#OC_STR_KEY}','{#OC_STR_SECRET}',OCstrInstallerLanguage ,'{#OC_STR_REGISTRY_PATH}');
+ // OPEN CANDY END
+end;
+
+function ShouldSkipPage(PageID: Integer): Boolean;
+begin
+ // OPEN CANDY START
+ Result := OpenCandyShouldSkipPage(PageID);
+ // OPEN CANDY END
+end;
+
+function NextButtonClick(CurPageID: Integer): Boolean;
+begin
+ // OPEN CANDY START
+ Result := OpenCandyNextButtonClick(CurPageID);
+ // OPEN CANDY END
+end;
+
+function BackButtonClick(CurPageID: Integer): Boolean;
+begin
+ // OPEN CANDY START
+ Result := OpenCandyBackButtonClick(CurPageID);
+ // OPEN CANDY END
+end;
+
+procedure DeinitializeSetup();
+begin
+ // OPEN CANDY START
+ OpenCandyDeinitializeSetup();
+ // OPEN CANDY END
+end;
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2010-10-17 15:38:32
|
Revision: 7310
http://winmerge.svn.sourceforge.net/winmerge/?rev=7310&view=rev
Author: christianlist
Date: 2010-10-17 15:38:25 +0000 (Sun, 17 Oct 2010)
Log Message:
-----------
PATCH: [ 3088720 ] Add OpenCandy to the InnoSetup installer
This is using the OpenCandy 1.4.2.28 Inno SDK.
The WinMerge.iss is including a file OpenCandyKeys.iss which is not included. This file contains the private keys for WinMerge, and can be obtained from the WinMerge administrators if you are creating the WinMerge releases.
If you just want to use the installer without the WinMerge keys, then remove this line:
#include <OpenCandyKeys.iss>
This makes the installer compile with default demo keys instead of the WinMerge specific keys.
Modified Paths:
--------------
branches/R2_14/Docs/Users/GPL.rtf
branches/R2_14/Installer/InnoSetup/WinMerge.iss
Added Paths:
-----------
branches/R2_14/Installer/InnoSetup/OCSetupHlp.dll
branches/R2_14/Installer/InnoSetup/OCSetupHlp.iss
branches/R2_14/Installer/InnoSetup/OpenCandy_Why_Is_This_Here.txt
Modified: branches/R2_14/Docs/Users/GPL.rtf
===================================================================
(Binary files differ)
Added: branches/R2_14/Installer/InnoSetup/OCSetupHlp.dll
===================================================================
(Binary files differ)
Property changes on: branches/R2_14/Installer/InnoSetup/OCSetupHlp.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/R2_14/Installer/InnoSetup/OCSetupHlp.iss
===================================================================
--- branches/R2_14/Installer/InnoSetup/OCSetupHlp.iss (rev 0)
+++ branches/R2_14/Installer/InnoSetup/OCSetupHlp.iss 2010-10-17 15:38:25 UTC (rev 7310)
@@ -0,0 +1,803 @@
+;---------------------------------------------------------------------------;
+; OCSetupHlp.iss ;
+;---------------------------------------------------------------------------;
+; ;
+; Header file for OpenCandy integration ;
+; with Inno Setup 5 projects and files. ;
+; ;
+;---------------------------------------------------------------------------;
+
+;
+; OpenCandy Defines
+; -----------------
+;
+; Used to abstract file names.
+;
+
+#define OCDLL "OCSetupHlp.dll"
+#define OCREADME "OpenCandy_Why_Is_This_Here.txt"
+
+[Code]
+
+#ifdef UNICODE
+type OCString = AnsiString;
+#else
+type OCString = String;
+#endif
+
+
+//
+// OpenCandy Global Variables
+// --------------------------
+//
+
+var
+
+ bDetached:boolean; // Used to keep track of offer page state
+ UseOfferPage: Boolean; // Used to know if we should shown an offer
+ OfferAccepted: Boolean; // Used to keep track of the user selection
+ OCOfferPage: TWizardPage; // Handle to the offer page wizard page
+ OCNOCANDY: Boolean; // Used to keep track of /NOCANDY parameter
+ ProductKey: OCString; // Used to store the product key
+ GoodOS: Boolean; // Used to store the results of the OS check
+ SignalSent: Boolean; // Used to keep track or server comm
+ GetOffersCalled: Boolean; // Used to keep track of the first call
+ ProductFailed: Boolean; // Keeps track of errors that may occur during product installation, so we can signal the DLL on failure
+ OffersReady: Boolean; // Set to false if offers are not ready in time
+
+//
+// OpenCandy DLL (OCSetupHlp) function declarations
+// ------------------------------------------------
+//
+// These functions are exported from OCSetupHlp.dll
+// and used throughout the setup to perform the operations
+// needed for the display of the offer page
+//
+
+function OCInit(a,b,c,d,e:OCString; f,bAsyncMode:Boolean): Integer;
+external 'OCInit2A@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+function OCGetBannerInfo(a,b:OCString):Integer;
+external 'OCGetBannerInfo@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+function OCRunPage(hwnd,r,g,b:Integer): Integer;
+external 'OCRunDialog@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+function OCAdjustPage(hwnd,x,y,w,h : Integer): Integer;
+external 'OCInnoAdjust@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+function OCRestorePage(hwnd:Integer): Integer;
+external 'OCInnoRestore@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+function OCGetOfferState(): Integer;
+external 'OCGetOfferState@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+function OCGetOfferType(cmdline:OCString): Integer;
+external 'OCGetOfferType@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+function OCFinish(Mgr:OCString):Integer;
+external 'OCExecuteOffer@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+function OCShutdown(): Integer;
+external 'OCShutdown@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+function OCDetach(): Integer;
+external 'OCDetach@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+function OCSignalProductInstalled():Integer;
+external 'OCSignalProductInstalled@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+function OCSetOfferLocation(location,OID,PID:OCString):Integer;
+external 'OCSetOfferLocation@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+function OCGetMsg(a,b:OCString):Integer;
+external 'OCGetMsg@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+function OCSignalProductFailed():Integer;
+external 'OCSignalProductFailed@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+// Checks if offers are ready or not.
+// 0 = Offers are ready to show
+// 1 = Offers are not ready, but might be. try waiting a little while
+// 2 = Offers are not ready, but might be. the delay could be long though.
+// 3 = No offers available
+function OpenCandyAreOffersReady():Integer;
+external 'OCGetAsyncOfferStatus@files:OCSetupHlp.dll cdecl loadwithalteredsearchpath delayload';
+
+//
+// String manipulation function declaration from Kernel32.dll
+// We use those to convert from UTF-8 to unicode and other codepages
+//
+
+Function MultiByteToWideChar(CodePage: UINT; dwFlags: DWORD;
+ lpMultiByteStr: OCString; cbMultiByte: integer;
+ lpWideCharStr: String; cchWideChar: integer): longint;
+external 'MultiByteToWideChar@kernel32.dll stdcall';
+
+Function WideCharToMultiByte(CodePage: UINT; dwFlags: DWORD;
+ lpWideCharStr: String; cchWideChar: integer;
+ lpMultiByteStr: OCString; cbMultiByte: integer;
+ lpDefaultChar: integer; lpUsedDefaultChar: integer): longint;
+external 'WideCharToMultiByte@kernel32.dll stdcall';
+
+//
+// Internal OpenCandy Helper Functions
+// -----------------------------------
+//
+// These functions are for internal use ONLY
+//
+
+//
+// ConvertUtf8ToCodePage()
+// -----------------------
+//
+// Internal function used to convert
+// the i18n messages we get from the DLL
+// into a given codepage for diplay in
+// the ASCII version of Inno
+//
+//
+
+function ConvertUtf8ToCodePage(strSource: OCString; codePage: UINT): OCString;
+var
+ nRet: integer;
+ WideCharBuf: OCString;
+ MultiByteBuf: OCString;
+
+begin
+ strSource := strSource + chr(0);
+ SetLength( WideCharBuf, Length( strSource ) * 2 );
+ SetLength( MultiByteBuf, Length( strSource ) * 3 );
+
+ // CP_UTF8 is 65001
+ nRet := MultiByteToWideChar(65001, 0, strSource, -1, WideCharBuf, Length(WideCharBuf));
+ nRet := WideCharToMultiByte(codePage, 0, WideCharBuf, -1, MultiByteBuf, Length(MultiByteBuf), 0, 0);
+
+ if(nRet = 0) then
+ begin
+ // Try with CP_ACP (ASCII)
+ WideCharToMultiByte(0, 0, WideCharBuf, -1, MultiByteBuf, Length(MultiByteBuf), 0, 0);
+ end;
+
+ Result := MultiByteBuf;
+end;
+
+//
+// ConvertUtf8ToUnicode()
+// -----------------------
+//
+// Internal function used to convert
+// the i18n messages we get from the DLL
+// into Unicode from UTF8
+//
+//
+
+function ConvertUtf8ToUnicode(strSource: OCString): String;
+var
+ nRet: integer;
+ WideCharBuf: String;
+begin
+ strSource := strSource + chr(0);
+ SetLength(WideCharBuf, Length(strSource)*2);
+
+ // CP_UTF8 is 65001
+ nRet := MultiByteToWideChar(65001, 0, strSource, -1, WideCharBuf, Length(WideCharBuf));
+
+ Result := WideCharBuf;
+end;
+
+
+
+// OpenCandyDetectOS()
+// -------------------
+//
+// Internal Operating System version
+// detection code, used to rule out
+// operation on Windows 2000 and below
+//
+
+procedure OpenCandyDetectOS();
+var
+ WindowsInfo: TWindowsVersion;
+begin
+ GoodOS := False;
+
+ GetWindowsVersionEx(WindowsInfo);
+ if WindowsInfo.NTPlatform and
+ ((WindowsInfo.Major > 5) or
+ ((WindowsInfo.Major = 5) and (WindowsInfo.minor > 0) )) then
+ begin
+ GoodOS := True;
+ end;
+end;
+
+//
+// External OpenCandy API Functions
+// -----------------------------------
+//
+// These functions are for use in your setup
+//
+
+//
+// OpenCandyInitRemnant()
+// ----------------------
+//
+// This function initializes the OpenCandy sytem. This function takes
+// and extra argument compared to OpenCandyInit() (dontShowOC:boolean)
+// that controls whrether an offer page is shown or not. This function
+// is for using with installations where a primary offer can be shown
+// in place of the OpenCandy offer.
+//
+
+
+procedure OpenCandyInitRemnant2(publisher: OCString;
+ key: OCString;
+ secret: OCString;
+ language: OCString;
+ location: OCString;
+ dontShowOC: boolean;
+ bUseAsyncMode: boolean);
+var
+ retval:integer;
+ i:integer;
+ title:OCString;
+ description:OCString;
+ OID: OCString;
+ uDesc: String;
+ uTitle: String;
+
+begin
+ // Set ProductInstalled to True once entire product install completes.
+ ProductFailed := False;
+ bDetached := True;
+ ProductKey := key;
+ OCNOCANDY := False;
+ OfferAccepted := False;
+ SignalSent := False;
+ UseOfferPage := False;
+ GetOffersCalled := False;
+ OffersReady := True;
+
+ OpenCandyDetectOS();
+
+ if GoodOS = False then Exit;
+ for i := 0 to ParamCount() do
+ begin;
+ if CompareText(ParamStr(i), '/NOCANDY') = 0 then
+ begin
+ OCNOCANDY := True;
+ if( i > 1) then
+ begin;
+ OID:=ParamStr(i-1);
+ retval:=OCSetOfferLocation(location,OID,key);
+ end;
+ end;
+ if CompareText(ParamStr(i), '/SILENT') = 0 then
+ begin
+ OCNOCANDY := True;
+ end;
+ if CompareText(ParamStr(i), '/VERYSILENT') = 0 then
+ begin
+ OCNOCANDY := True;
+ end;
+ end;
+
+ if(OCNOCANDY <> True) and (dontShowOC <> True) then
+ begin
+ retval := OCInit(publisher, key, secret, language, location, false,bUseAsyncMode);
+
+ GetOffersCalled := True;
+
+ if retval = 0 then
+ begin
+
+ UseOfferPage := True;
+ title:=StringOfChar(' ',512);
+ description:=StringOfChar(' ',512);
+ retval:= OCGetBannerInfo(title,description);
+ if retval = 1 then
+ begin
+ description:='';
+ end;
+ if retval = 2 then
+ begin
+ title :='';
+ end;
+ if (retval = -1) OR (retval=0) then
+ begin
+ description:='blah';
+ title :='blah';
+ end;
+
+ #ifdef UNICODE
+ uDesc := ConvertUtf8ToUnicode(description);
+ uTitle := ConvertUtf8ToUnicode(title);
+ OCOfferPage := CreateCustomPage(wpSelectTasks, uTitle, uDesc);
+ #else
+ description := ConvertUtf8ToCodePage(description, GetUILanguage());
+ title := ConvertUtf8ToCodePage(title, GetUILanguage());
+ OCOfferPage := CreateCustomPage(wpSelectTasks, title, description);
+ #endif
+
+
+ end;
+ end;
+end;
+
+
+procedure OpenCandyInitRemnant(key: OCString;
+ secret: OCString;
+ language: OCString;
+ location: OCString;
+ dontShowOC: boolean);
+begin
+ OpenCandyInitRemnant2('', key, secret, language, location, dontShowOC, False);
+end;
+
+
+//
+// OpenCandyInit()
+// ---------------
+//
+// These function initializes the OpenCandy system.
+// It calls the OpenCandyInitRemnant() function with
+// the last parameter set to False, so that the offer
+// page will be shown (if available). This is the
+// normal scenario.
+
+// Includes publisher parameter
+procedure OpenCandyInit2(publisher: OCString;
+ key: OCString;
+ secret: OCString;
+ language: OCString;
+ location: OCString;
+ bUseAsyncMode: Boolean);
+begin
+ OpenCandyInitRemnant2(publisher,
+ key,
+ secret,
+ language,
+ location,
+ False,
+ bUseAsyncMode);
+end;
+
+// Use server setting
+procedure OpenCandyInit(publisher: OCString;
+ key: OCString;
+ secret: OCString;
+ language: OCString;
+ location: OCString);
+begin
+ OpenCandyInitRemnant2(publisher,
+ key,
+ secret,
+ language,
+ location,
+ False,
+ False);
+end;
+
+
+
+//
+// OpenCandyShouldSkipPage()
+// -------------------------
+//
+// Checks if page should be skipped
+//
+
+
+function OpenCandyShouldSkipPage(CurPageID: Integer) : Boolean;
+var
+ retval: Integer;
+ nOffersState: Integer;
+begin
+
+ if GoodOS = false then Exit;
+
+ if UseOfferPage = True then
+ begin
+ if CurPageID = OCOfferPage.ID then
+ begin
+ if OffersReady = False then
+ begin
+ Result := True;
+ //MsgBox('OpenCandyShouldSkipPage', mbInformation, MB_OK);
+ Exit;
+ end;
+ if bDetached = True then
+ begin
+ Result := True;
+ bDetached := False;
+ OffersReady := False;
+ //MsgBox('ShouldSkipPage', mbInformation, MB_OK);
+ retval := OCRunPage(OCOfferPage.Surface.Handle,240,240,240);
+ if retval <> -1 then
+ begin
+ Result := False;
+ OffersReady := True;
+ //MsgBox('Not skipping Page', mbInformation, MB_OK);
+ end;
+ if retval = -1 then
+ begin
+ //MsgBox('OpenCandyShouldSkipPage', mbInformation, MB_OK);
+ end;
+ end;
+ end;
+ end;
+end;
+
+//
+// OpenCandyCurPageChanged()
+// -------------------------
+//
+// This function is to be called from CurPageChanged()
+// It makes sure to run the OpenCandy offer page when it
+// is time to run it.
+//
+
+procedure OpenCandyCurPageChanged(CurPageID: Integer);
+var
+ retval: Integer;
+begin
+ if GoodOS = false then Exit;
+ if OffersReady = False then
+ begin
+ Exit;
+ end;
+
+ if UseOfferPage = True then
+ begin
+ if CurPageID = OCOfferPage.ID then
+ begin
+ retval := OCAdjustPage(OCOfferPage.Surface.Handle,12,70,480,300);
+ end;
+ end;
+end;
+
+//
+// OpenCandyNextButtonClick()
+// --------------------------
+//
+// This function should be called from NextButtonClick()
+// It handles the logic of the Offer page, making
+// sure a selection was made (offer or no offer) before.
+//
+
+function OpenCandyNextButtonClick(CurPageID: Integer): Boolean;
+var
+ retval: Integer;
+ getmsg: Integer;
+ shouldContinue: Boolean;
+ msgText: OCString;
+ uMsg: String;
+begin
+ shouldContinue := True;
+
+ if GoodOS = false then
+ begin
+ Result := shouldContinue;
+ Exit;
+ end;
+
+ if UseOfferPage = True then
+ begin
+ if CurPageID = OCOfferPage.ID then
+ begin
+
+ retval := OCGetOfferState();
+
+ if( retval < 0) then
+ begin
+ msgText := StringOfChar(' ', 1024);
+ getmsg := OCGetMsg('PleaseChoose', msgText);
+#ifdef UNICODE
+ uMsg := ConvertUtf8ToUnicode(msgText);
+ MsgBox(uMsg, mbInformation, MB_OK);
+#else
+ msgText := ConvertUtf8ToCodePage(msgText, GetUILanguage());
+ MsgBox(msgText, mbInformation, MB_OK);
+#endif
+ shouldContinue := False;
+ end;
+
+ if(retval >= 0) then
+ begin
+
+ OfferAccepted := False;
+ if(retval = 1) then
+ begin
+ OfferAccepted := True;
+ end;
+ //MsgBox('OCRestorePage 1', mbInformation, MB_OK);
+ retval := OCRestorePage(OCOfferPage.Surface.Handle);
+ shouldContinue := True;
+ end;
+
+ end;
+ end;
+
+ Result := shouldContinue;
+end;
+
+//
+// OpenCandyBackButtonClick()
+// --------------------------
+//
+// This function should be called from BackButtonClick().
+// It restores the layout of the installer window for
+// other pages to use.
+//
+
+function OpenCandyBackButtonClick(CurPageID: Integer): Boolean;
+begin
+ if GoodOS = false then
+ begin
+ Result := True;
+ Exit;
+ end;
+
+ if UseOfferPage = True then
+ begin
+ if CurPageID = OCOfferPage.ID then
+ begin
+ //MsgBox('OCRestorePage 2', mbInformation, MB_OK);
+ OCRestorePage(OCOfferPage.Surface.Handle);
+ end;
+ end;
+
+ Result := True;
+end;
+
+//
+// OpenCandyDeinitializeSetup()
+// ----------------------------
+//
+// This should be called from DeinitializeSetup()
+// It cleans up the temporarily loaded DLL and releases
+// the memory we have been using (if any).
+//
+
+procedure OpenCandyDeinitializeSetup();
+var
+retval:integer;
+begin
+ if GoodOS = false then Exit;
+
+ if UseOfferPage = True then
+ begin
+ if ProductFailed = True then
+ begin
+ retval := OCSignalProductFailed();
+ end;
+
+ if bDetached = False then
+ begin
+ bDetached:=True;
+ retval:=OCDetach();
+ end;
+ OCShutdown();
+ end;
+
+end;
+
+//
+// OpenCandyCurStepChanged()
+// -------------------------
+//
+// This should be called from CurStepChanged().
+//
+// It handles necesary operations at the various
+// different stages of the setup.
+//
+
+procedure OpenCandyCurStepChanged(CurStep: TSetupStep);
+var
+ retval: Integer;
+ s,s2: OCString;
+ cmdline: OCString;
+begin
+ if CurStep = ssInstall then
+ begin
+ // Set to true in case it fails.
+ ProductFailed:= True;
+ end;
+ if CurStep = ssPostInstall then
+ begin
+ ProductFailed:= False;
+ end;
+
+
+
+ if GoodOS = false then Exit;
+
+ // Install Step
+
+ if CurStep = ssInstall then
+ begin
+ if UseOfferPage = True then
+ begin
+ if bDetached = False then
+ begin
+ bDetached := True;
+ retval := OCDetach();
+ end;
+ end;
+ end;
+
+ // Post Install Step
+
+ if CurStep = ssPostInstall then
+ begin
+ if OCNOCANDY = False then
+ begin
+ if UseOfferPage = True then
+ begin
+ cmdline := StringOfChar(' ',1024);
+ retval := OCGetOfferType(cmdline);
+
+ if retval = 1 then // OC_OFFER_TYPE_NORMAL
+ begin
+ s := ExpandConstant('{app}') + '\OpenCandy\{#OCDLL}';
+ s := GetShortName(s);
+ s2 := s + ',_MgrCheck@16';
+ retval:=OCFinish(s2);
+ end;
+ end;
+ end;
+ end;
+
+ // Install Done Step
+
+ if CurStep = ssDone then
+ begin
+ if (OCNOCANDY = False) and (GetOffersCalled = True) then
+ begin
+ // Product was installed so let's signal it
+
+ retval := OCSignalProductInstalled();
+
+ // Check if offer was accepted
+ if (OfferAccepted = True) then
+ begin
+
+ cmdline := StringOfChar(' ',1024);
+ retval := OCGetOfferType(cmdline);
+
+ if retval = 1 then // OC_OFFER_TYPE_NORMAL
+ begin
+ // Offer was accepted, let's run
+ s := ExpandConstant('{app}') + '\OpenCandy\OCSetupHlp.Dll';
+ s := GetShortName(s);
+ s := s + ',_MgrCheck@16';
+ s:='RunDll32.exe ' + s;
+ Exec('>', s, '', SW_SHOW, ewNoWait, retval);
+ end;
+ end;
+ end;
+ end;
+end;
+
+//
+// OpenCandyProcessEmbedded()
+// --------------------------
+//
+// This function should NOT be called
+// directly. It serves as an installation
+// handle for the OCDLL file (see the Files
+// section in the main setup script)
+//
+
+procedure OpenCandyProcessEmbedded();
+var
+ retval: Integer;
+ str: OCString;
+ cmdline: OCString;
+ params: OCString;
+ tmp: OCString;
+ ResultCode: Integer;
+begin
+ if GoodOS = false then Exit;
+
+ if UseOfferPage = True then
+ begin
+ cmdline := StringOfChar(' ',1024);
+ retval := OCGetOfferType(cmdline);
+ if retval = 2 then // OC_OFFER_TYPE_EMBEDDED
+ begin
+
+ str := ExpandConstant('{app}') + '\OpenCandy\{#OCDLL}';
+ str := GetShortName(str);
+ str := str + ',_MgrCheck@16';
+ retval:=OCFinish(str);
+
+ if(OfferAccepted = True) then
+ begin
+ str := 'RunDll32.exe ' + str;
+
+ // The DLL does not append a \0 since inno chokes on it, so we need to trim the string back down.
+ tmp := TrimRight(cmdline);
+ params := tmp + ' /S' + ProductKey;
+
+ str := str + params;
+ Exec('>', str, '', SW_HIDE, ewWaitUntilTerminated, ResultCode);
+ end;
+
+ end;
+ end;
+end;
+
+//
+// OpenCandyCheckInstallDLL()
+// --------------------------
+//
+// This function should NOT be called
+// directly. It serves as an installation
+// check for the OCDLL files (see the Files
+// section in the main setup script)
+//
+
+function OpenCandyCheckInstallDLL(): Boolean;
+var
+ str: OCString;
+ retval: Integer;
+ cmdline: OCString;
+begin
+
+ Result := False;
+
+ if GoodOS = false then Exit;
+
+ if (UseOfferPage = True) and (OCNOCANDY = False) then
+ begin
+ if (OfferAccepted = False) and (SignalSent = False) then
+ begin
+ cmdline := StringOfChar(' ',1024);
+ retval := OCGetOfferType(cmdline);
+
+ if retval = 2 then // OC_OFFER_TYPE_EMBEDDED
+ begin
+ // We won't install the DLL but
+ // we still need to call OCFinish()
+
+ str := ExpandConstant('{app}') + '\OpenCandy\{#OCDLL}';
+ str := GetShortName(str);
+ str := str + ',_MgrCheck@16';
+ OCFinish(str);
+ SignalSent := True;
+ end;
+ end;
+ end;
+
+ Result := OfferAccepted;
+end;
+
+//
+// OpenCandyCheckInstallReadme()
+// -----------------------------
+//
+// This function should NOT be called
+// directly. It serves as an installation
+// check for the OCREADME file (see the Files
+// section in the main setup script)
+//
+
+function OpenCandyCheckInstallReadme(): Boolean;
+begin
+ Result := OfferAccepted;
+end;
+
+//---------------------------------------------------------------------------//
+// End of File //
+//---------------------------------------------------------------------------//
+
+
+
+
+
+
+
+
+
+
Added: branches/R2_14/Installer/InnoSetup/OpenCandy_Why_Is_This_Here.txt
===================================================================
--- branches/R2_14/Installer/InnoSetup/OpenCandy_Why_Is_This_Here.txt (rev 0)
+++ branches/R2_14/Installer/InnoSetup/OpenCandy_Why_Is_This_Here.txt 2010-10-17 15:38:25 UTC (rev 7310)
@@ -0,0 +1,52 @@
+What is OpenCandy?
+
+OpenCandy is a platform and network which enables software publishers
+to recommend other products, during installation of their software, they
+believe you will find valuable.
+
+So\x85 What is this folder, its contents, and why is it here?
+
+These files are only on your computer because you accepted a software
+recommendation. These files are TEMPORARILY copied to a folder within
+the publisher's program files directory until the recommended software
+is downloaded and installation is performed.
+
+This folder contains:
+
+ * OpenCandy_Why_Is_This_Here.txt
+ - This text file you\x92re reading. :)
+
+ * OCSetupHlp.dll
+ - This file is used to display a recommendation during the
+ publisher\x92s software installation and to facilitate the download
+ and installation of the recommended software. This file also
+ allows us to provide software publishers with *non personally
+ identifiable* information such as statistics like install
+ initiated and completed, country, operating system and language,
+ and whether the software recommendation was accepted or not.
+
+After the recommended software\x92s installation is started (and regardless
+of whether it is successfully completed) these files and the 'OpenCandy'
+folder will be automatically deleted next time the system is restarted.
+
+The possible reasons this folder and its contents remain are:
+
+ A) You rebooted before installing the recommend software
+ B) You lost power before the recommended software was installed
+ C) Your computer exploded before the recommended software was
+ installed (Then how are you reading this?)
+
+Feel free to delete this OpenCandy folder (and its contents) at any
+time; there is no harm in doing so. If you believe this folder and its
+files should have been deleted and were not (and neither A, B, or C
+happened), we'd appreciate if you contacted us (see below) and told us
+what you think happened. If it happens to be a bug, we'll fix it so this
+doesn't happen to anyone else. Oh yeah, and we'll send you an awesome
+purple t-shirt for helping us out!
+
+If you have any questions, please don\x92t hesitate to contact us at
+www.opencandy.com/contact/.
+
+Thank you.
+
+- The OpenCandy team
\ No newline at end of file
Modified: branches/R2_14/Installer/InnoSetup/WinMerge.iss
===================================================================
--- branches/R2_14/Installer/InnoSetup/WinMerge.iss 2010-10-17 12:15:28 UTC (rev 7309)
+++ branches/R2_14/Installer/InnoSetup/WinMerge.iss 2010-10-17 15:38:25 UTC (rev 7310)
@@ -52,7 +52,33 @@
#define RuntimesX86Installer "..\..\..\Runtimes\vcredist_x86.exe"
#define RuntimesX64Installer "..\..\..\Runtimes\vcredist_x64.exe"
+; OpenCandy includes and defines
+#include <OCSetupHlp.iss>
+// The OpenCandyKeys.iss file contains the WinMerge specific OpenCandy keys.
+// The file can be obtained from the WinMerge administrators.
+// Remove the next line to use the demo keys only.
+#include <OpenCandyKeys.iss>
+
+#define OC_STR_MY_PRODUCT_NAME "WinMerge"
+
+// Note: These keys are demo keys only, the WinMerge keys are kept somewhere else
+#ifndef OC_STR_KEY
+ #define OC_STR_KEY "1401d0bd8048e1f0f4628dbec1a73092"
+#endif
+#ifndef OC_STR_SECRET
+ #define OC_STR_SECRET "4564bdaf826bbe2115718d1643ecc19e"
+#endif
+
+#define OC_STR_REGISTRY_PATH "Software\Thingamahoochie\OpenCandy"
+
+#if OC_STR_KEY == "1401d0bd8048e1f0f4628dbec1a73092"
+ #pragma warning "Do not forget to change the test key '1401d0bd8048e1f0f4628dbec1a73092' to your company's product key before releasing this installer."
+#endif
+#if OC_STR_SECRET == "4564bdaf826bbe2115718d1643ecc19e"
+ #pragma warning "Do not forget to change the test secret '4564bdaf826bbe2115718d1643ecc19e' to your company's product secret before releasing this installer."
+#endif
+
[Setup]
AppName=WinMerge
AppVersion={#AppVersion}
@@ -155,7 +181,7 @@
English.FinishedLabel=Setup has finished installing WinMerge on your computer.
English.SetupAppTitle=Setup - WinMerge {#AppVersion}
English.WizardInfoBefore=License Agreement
-English.InfoBeforeLabel=GNU General Public License
+English.InfoBeforeLabel=GNU General Public License & OpenCandy EULA
[Types]
@@ -455,6 +481,10 @@
Source: ..\..\Plugins\dlls\insert datetime.sct; DestDir: {app}\MergePlugins; Flags: IgnoreVersion CompareTimeStamp; Components: Plugins
Source: ..\..\Plugins\dlls\*.dll; DestDir: {app}\MergePlugins; Flags: promptifolder; Components: Plugins
+; OPEN CANDY START
+Source: {#OCREADME}; DestDir: {app}\OpenCandy; Flags: overwritereadonly ignoreversion; Check: OpenCandyCheckInstallReadme
+Source: {#OCDLL}; DestDir: {app}\OpenCandy; Flags: overwritereadonly ignoreversion; Check: OpenCandyCheckInstallDLL; AfterInstall: OpenCandyProcessEmbedded
+; OPEN CANDY END
[Icons]
;Start Menu Icons
@@ -970,6 +1000,9 @@
If CurPage = wpInstalling Then
{Delete the previous start menu group if the location has changed since the last install}
DeletePreviousStartMenu;
+ // OPEN CANDY START
+ OpenCandyCurPageChanged(CurPage);
+ // OPEN CANDY END
End;
// Checks if context menu is already enabled for shell extension
@@ -1088,6 +1121,9 @@
IntegrateClearCase('..\..\bin\cleardiffmrg.exe', WinMergeExeName());
end;
end;
+ // OPEN CANDY START
+ OpenCandyCurStepChanged(CurStep);
+ // OPEN CANDY END
End;
Procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
@@ -1109,3 +1145,139 @@
IntegrateClearCase(WinMergeExeName(), '..\..\bin\cleardiffmrg.exe');
end;
End;
+
+procedure InitializeWizard;
+Var OCstrInstallerLanguage: String;
+begin
+ // OPEN CANDY START
+ // Convert the internal language name to an ISO 639-1 code. Find a list at http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
+ Case ActiveLanguage of
+ 'default' : Begin
+ OCstrInstallerLanguage := 'en';
+ End;
+ 'English' : Begin
+ OCstrInstallerLanguage := 'en';
+ End;
+ 'Bulgarian' : Begin
+ OCstrInstallerLanguage := 'bg';
+ End;
+ 'Catalan' : Begin
+ OCstrInstallerLanguage := 'ca';
+ End;
+ 'Chinese_Simplified' : Begin
+ OCstrInstallerLanguage := 'zh';
+ End;
+ 'Chinese_Traditional' : Begin
+ OCstrInstallerLanguage := 'zh';
+ End;
+ 'Croatian' : Begin
+ OCstrInstallerLanguage := 'hr';
+ End;
+ 'Czech' : Begin
+ OCstrInstallerLanguage := 'cs';
+ End;
+ 'Danish' : Begin
+ OCstrInstallerLanguage := 'da';
+ End;
+ 'Dutch' : Begin
+ OCstrInstallerLanguage := 'nl';
+ End;
+ 'French' : Begin
+ OCstrInstallerLanguage := 'fr';
+ End;
+ 'Galician' : Begin
+ OCstrInstallerLanguage := 'gl';
+ End;
+ 'German' : Begin
+ OCstrInstallerLanguage := 'de';
+ End;
+ 'Greek' : Begin
+ OCstrInstallerLanguage := 'el';
+ End;
+ 'Hungarian' : Begin
+ OCstrInstallerLanguage := 'hu';
+ End;
+ 'Italian' : Begin
+ OCstrInstallerLanguage := 'it';
+ End;
+ 'Japanese' : Begin
+ OCstrInstallerLanguage := 'ja';
+ End;
+ 'Korean' : Begin
+ OCstrInstallerLanguage := 'ko';
+ End;
+ 'Norwegian' : Begin
+ OCstrInstallerLanguage := 'no';
+ End;
+ 'Persian' : Begin
+ OCstrInstallerLanguage := 'fa';
+ End;
+ 'Polish' : Begin
+ OCstrInstallerLanguage := 'pl';
+ End;
+ 'Portuguese' : Begin
+ OCstrInstallerLanguage := 'pt';
+ End;
+ 'PortugueseBrazilian' : Begin
+ OCstrInstallerLanguage := 'pt';
+ End;
+ 'Romanian' : Begin
+ OCstrInstallerLanguage := 'ro';
+ End;
+ 'Russian' : Begin
+ OCstrInstallerLanguage := 'ru';
+ End;
+ 'Serbian' : Begin
+ OCstrInstallerLanguage := 'sr';
+ End;
+ 'Slovak' : Begin
+ OCstrInstallerLanguage := 'sk';
+ End;
+ 'Slovenian' : Begin
+ OCstrInstallerLanguage := 'sl';
+ End;
+ 'Spanish' : Begin
+ OCstrInstallerLanguage := 'es';
+ End;
+ 'Swedish' : Begin
+ OCstrInstallerLanguage := 'sv';
+ End;
+ 'Turkish' : Begin
+ OCstrInstallerLanguage := 'tr';
+ End;
+ 'Ukrainian' : Begin
+ OCstrInstallerLanguage := 'uk';
+ End;
+ End; {End Case}
+ OpenCandyInit('{#OC_STR_MY_PRODUCT_NAME}','{#OC_STR_KEY}','{#OC_STR_SECRET}',OCstrInstallerLanguage ,'{#OC_STR_REGISTRY_PATH}');
+ // OPEN CANDY END
+end;
+
+function ShouldSkipPage(PageID: Integer): Boolean;
+begin
+ // OPEN CANDY START
+ Result := OpenCandyShouldSkipPage(PageID);
+ // OPEN CANDY END
+end;
+
+function NextButtonClick(CurPageID: Integer): Boolean;
+begin
+ // OPEN CANDY START
+ Result := OpenCandyNextButtonClick(CurPageID);
+ // OPEN CANDY END
+end;
+
+function BackButtonClick(CurPageID: Integer): Boolean;
+begin
+ // OPEN CANDY START
+ Result := OpenCandyBackButtonClick(CurPageID);
+ // OPEN CANDY END
+end;
+
+procedure DeinitializeSetup();
+begin
+ // OPEN CANDY START
+ OpenCandyDeinitializeSetup();
+ // OPEN CANDY END
+end;
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-17 12:15:34
|
Revision: 7309
http://winmerge.svn.sourceforge.net/winmerge/?rev=7309&view=rev
Author: gerundt
Date: 2010-10-17 12:15:28 +0000 (Sun, 17 Oct 2010)
Log Message:
-----------
Fixing 64-bit build warnings in R2_14
Modified Paths:
--------------
branches/R2_14/Src/ChildFrm.cpp
branches/R2_14/Src/Common/CMoveConstraint.cpp
branches/R2_14/Src/Common/CMoveConstraint.h
branches/R2_14/Src/Common/MessageBoxDialog.h
branches/R2_14/Src/Common/PropertyPageHost.cpp
branches/R2_14/Src/Common/PropertyPageHost.h
branches/R2_14/Src/Merge.cpp
branches/R2_14/Src/MovedBlocks.cpp
Modified: branches/R2_14/Src/ChildFrm.cpp
===================================================================
--- branches/R2_14/Src/ChildFrm.cpp 2010-10-16 19:08:36 UTC (rev 7308)
+++ branches/R2_14/Src/ChildFrm.cpp 2010-10-17 12:15:28 UTC (rev 7309)
@@ -326,7 +326,7 @@
*/
BOOL CChildFrame::EnsureValidDockState(CDockState& state)
{
- for (int i = state.m_arrBarInfo.GetSize()-1 ; i >= 0; i--)
+ for (int i = (int) state.m_arrBarInfo.GetSize()-1 ; i >= 0; i--)
{
BOOL barIsCorrect = TRUE;
CControlBarInfo* pInfo = (CControlBarInfo*)state.m_arrBarInfo[i];
Modified: branches/R2_14/Src/Common/CMoveConstraint.cpp
===================================================================
--- branches/R2_14/Src/Common/CMoveConstraint.cpp 2010-10-16 19:08:36 UTC (rev 7308)
+++ branches/R2_14/Src/Common/CMoveConstraint.cpp 2010-10-17 12:15:28 UTC (rev 7309)
@@ -626,7 +626,7 @@
bool
CMoveConstraint::OnTtnNeedText(TOOLTIPTEXT * pTTT, LRESULT * plresult)
{
- UINT id = pTTT->hdr.idFrom;
+ UINT_PTR id = pTTT->hdr.idFrom;
UINT uflags = pTTT->uFlags;
if (uflags & TTF_IDISHWND)
id = GetDlgCtrlID((HWND)id);
Modified: branches/R2_14/Src/Common/CMoveConstraint.h
===================================================================
--- branches/R2_14/Src/Common/CMoveConstraint.h 2010-10-16 19:08:36 UTC (rev 7308)
+++ branches/R2_14/Src/Common/CMoveConstraint.h 2010-10-17 12:15:28 UTC (rev 7309)
@@ -249,7 +249,7 @@
CString m_sRegistrySubkey; // defaults to _T("LastWindowPos")
CString m_sRegistryValueName; // should be name of window
// tooltips
- CMap<UINT, UINT, tip, tip&> m_tips;
+ CMap<UINT_PTR, UINT_PTR, tip, tip&> m_tips;
};
} // namespace
Modified: branches/R2_14/Src/Common/MessageBoxDialog.h
===================================================================
--- branches/R2_14/Src/Common/MessageBoxDialog.h 2010-10-16 19:08:36 UTC (rev 7308)
+++ branches/R2_14/Src/Common/MessageBoxDialog.h 2010-10-17 12:15:28 UTC (rev 7309)
@@ -204,7 +204,7 @@
UINT m_nTimeoutSeconds; // Seconds for a timeout.
BOOL m_bTimeoutDisabled; // Flag whether the timeout is disabled.
- UINT m_nTimeoutTimer; // Timer for the timeout.
+ UINT_PTR m_nTimeoutTimer; // Timer for the timeout.
CString m_strRegistryKey; // Entry for storing the result in the
// registry, if the MB_DONT_DISPLAY_AGAIN
Modified: branches/R2_14/Src/Common/PropertyPageHost.cpp
===================================================================
--- branches/R2_14/Src/Common/PropertyPageHost.cpp 2010-10-16 19:08:36 UTC (rev 7308)
+++ branches/R2_14/Src/Common/PropertyPageHost.cpp 2010-10-17 12:15:28 UTC (rev 7309)
@@ -200,7 +200,7 @@
if (FindPage(pPage) == -1)
{
PAGEITEM pi(pPage, szTitle, dwItemData);
- int nPage = m_aPages.Add(pi);
+ int nPage = (int) m_aPages.Add(pi);
if (szTitle)
{
@@ -214,7 +214,7 @@
int CPropertyPageHost::FindPage(CPropertyPage* pPage)
{
- int nPage = m_aPages.GetSize();
+ int nPage = (int) m_aPages.GetSize();
while (nPage--)
{
@@ -310,7 +310,7 @@
void CPropertyPageHost::OnOK()
{
- int nPage = m_aPages.GetSize();
+ int nPage = (int) m_aPages.GetSize();
while (nPage--)
{
@@ -329,7 +329,7 @@
*/
void CPropertyPageHost::UpdatePagesData()
{
- int nPage = m_aPages.GetSize();
+ int nPage = (int) m_aPages.GetSize();
while (nPage--)
{
@@ -384,7 +384,7 @@
CPropertyPage* CPropertyPageHost::FindPage(DWORD dwItemData)
{
- int nPage = m_aPages.GetSize();
+ int nPage = (int) m_aPages.GetSize();
while (nPage--)
{
Modified: branches/R2_14/Src/Common/PropertyPageHost.h
===================================================================
--- branches/R2_14/Src/Common/PropertyPageHost.h 2010-10-16 19:08:36 UTC (rev 7308)
+++ branches/R2_14/Src/Common/PropertyPageHost.h 2010-10-17 12:15:28 UTC (rev 7309)
@@ -48,7 +48,7 @@
BOOL AddPage(CPropertyPage* pPage, LPCTSTR szTitle = NULL, DWORD dwItemData = 0);
BOOL SetActivePage(int nIndex, BOOL bAndFocus = TRUE);
BOOL SetActivePage(CPropertyPage* pPage, BOOL bAndFocus = TRUE);
- int GetPageCount() { return m_aPages.GetSize(); }
+ int GetPageCount() { return (int) m_aPages.GetSize(); }
CString GetPageTitle(int nIndex);
DWORD GetPageItemData(int nIndex);
CPropertyPage* GetPage(int nIndex);
Modified: branches/R2_14/Src/Merge.cpp
===================================================================
--- branches/R2_14/Src/Merge.cpp 2010-10-16 19:08:36 UTC (rev 7308)
+++ branches/R2_14/Src/Merge.cpp 2010-10-17 12:15:28 UTC (rev 7309)
@@ -504,7 +504,7 @@
nIDPrompt);
// Display the message box dialog and return the result.
- return dlgMessage.DoModal();
+ return (int) dlgMessage.DoModal();
}
/**
Modified: branches/R2_14/Src/MovedBlocks.cpp
===================================================================
--- branches/R2_14/Src/MovedBlocks.cpp 2010-10-16 19:08:36 UTC (rev 7308)
+++ branches/R2_14/Src/MovedBlocks.cpp 2010-10-17 12:15:28 UTC (rev 7309)
@@ -31,7 +31,7 @@
public:
void Add(int val) { m_map.SetAt(val, 1); }
void Remove(int val) { m_map.RemoveKey(val); }
- int count() const { return m_map.GetCount(); }
+ int count() const { return (int) m_map.GetCount(); }
bool isPresent(int val) const { int parm; return !!m_map.Lookup(val, parm); }
int getSingle() const
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-16 19:08:42
|
Revision: 7308
http://winmerge.svn.sourceforge.net/winmerge/?rev=7308&view=rev
Author: gerundt
Date: 2010-10-16 19:08:36 +0000 (Sat, 16 Oct 2010)
Log Message:
-----------
Fixing 64-bit build warnings in R2_14
Modified Paths:
--------------
branches/R2_14/Src/editlib/ccrystaleditview.cpp
branches/R2_14/Src/editlib/ccrystaltextbuffer.cpp
branches/R2_14/Src/editlib/ccrystaltextview.cpp
branches/R2_14/Src/editlib/ccrystaltextview.h
branches/R2_14/Src/editlib/ccrystaltextview2.cpp
branches/R2_14/Src/editlib/registry.cpp
Modified: branches/R2_14/Src/editlib/ccrystaleditview.cpp
===================================================================
--- branches/R2_14/Src/editlib/ccrystaleditview.cpp 2010-10-16 16:15:56 UTC (rev 7307)
+++ branches/R2_14/Src/editlib/ccrystaleditview.cpp 2010-10-16 19:08:36 UTC (rev 7308)
@@ -494,7 +494,7 @@
ptCursorPos = GetCursorPos ();
ASSERT_VALIDTEXTPOS (ptCursorPos);
LPCTSTR pszText = m_pTextBuffer->GetDefaultEol();
- int cchText = _tcslen(pszText);
+ int cchText = (int) _tcslen(pszText);
int x, y;
m_pTextBuffer->InsertText (this, ptCursorPos.y, ptCursorPos.x, pszText, cchText, y, x, CE_ACTION_TYPING); // [JRT]
@@ -520,7 +520,7 @@
if (QueryEditable () && m_pTextBuffer != NULL)
{
m_pTextBuffer->BeginUndoGroup (m_bMergeUndo);
- m_bMergeUndo = true;
+ m_bMergeUndo = true;
CPoint ptSelStart, ptSelEnd;
GetSelection (ptSelStart, ptSelEnd);
@@ -728,7 +728,7 @@
for (int L = nStartLine; L <= nEndLine; L++)
{
int x, y;
- m_pTextBuffer->InsertText (this, L, 0, pszText, _tcslen(pszText), y, x, CE_ACTION_INDENT); // [JRT]
+ m_pTextBuffer->InsertText (this, L, 0, pszText, (int) _tcslen(pszText), y, x, CE_ACTION_INDENT); // [JRT]
}
m_bHorzScrollBarLocked = FALSE;
@@ -795,12 +795,12 @@
// [JRT]:
m_pTextBuffer->DeleteText (this, ptSelStart.y, ptSelStart.x, ptSelEnd.y, ptSelEnd.x, CE_ACTION_TYPING);
- m_pTextBuffer->InsertText( this, ptSelStart.y, ptSelStart.x, pszText, _tcslen(pszText), y, x, CE_ACTION_TYPING );
+ m_pTextBuffer->InsertText( this, ptSelStart.y, ptSelStart.x, pszText, (int) _tcslen(pszText), y, x, CE_ACTION_TYPING );
}
// No selection, add tab
else
{
- m_pTextBuffer->InsertText (this, ptCursorPos.y, ptCursorPos.x, pszText, _tcslen(pszText), y, x, CE_ACTION_TYPING); // [JRT]
+ m_pTextBuffer->InsertText (this, ptCursorPos.y, ptCursorPos.x, pszText, (int) _tcslen(pszText), y, x, CE_ACTION_TYPING); // [JRT]
}
ptCursorPos.x = x;
@@ -1133,8 +1133,8 @@
return FALSE;
}
- SIZE_T cbData = ::GlobalSize (hData);
- int cchText = cbData / sizeof(TCHAR) - 1;
+ UINT cbData = (UINT) ::GlobalSize (hData);
+ UINT cchText = cbData / sizeof(TCHAR) - 1;
if (cchText < 0)
return FALSE;
LPTSTR pszText = (LPTSTR)::GlobalLock (hData);
@@ -1576,7 +1576,7 @@
{
static LPCTSTR braces = _T("{}()[]<>");
LPCTSTR pos = _tcschr (braces, c);
- return pos ? pos - braces + 1 : 0;
+ return pos ? (int) (pos - braces) + 1 : 0;
}
int
Modified: branches/R2_14/Src/editlib/ccrystaltextbuffer.cpp
===================================================================
--- branches/R2_14/Src/editlib/ccrystaltextbuffer.cpp 2010-10-16 16:15:56 UTC (rev 7307)
+++ branches/R2_14/Src/editlib/ccrystaltextbuffer.cpp 2010-10-16 19:08:36 UTC (rev 7308)
@@ -926,7 +926,7 @@
memcpy (pszBuf, m_aLines[nStartLine].GetLine(nStartChar), sizeof (TCHAR) * nCount);
pszBuf += nCount;
}
- text.ReleaseBuffer (pszBuf - text);
+ text.ReleaseBuffer ((int) (pszBuf - text));
text.FreeExtra ();
}
@@ -1819,7 +1819,7 @@
// Start from the end of text
bWrapIt = FALSE;
- nCurrentLine = nSize - 1;
+ nCurrentLine = (int) (nSize - 1);
}
return -1;
}
Modified: branches/R2_14/Src/editlib/ccrystaltextview.cpp
===================================================================
--- branches/R2_14/Src/editlib/ccrystaltextview.cpp 2010-10-16 16:15:56 UTC (rev 7307)
+++ branches/R2_14/Src/editlib/ccrystaltextview.cpp 2010-10-16 19:08:36 UTC (rev 7308)
@@ -808,7 +808,7 @@
static void AppendStringAdv(CString & str, int & curpos, LPCTSTR szadd)
{
str += szadd;
- curpos += _tcslen(szadd);
+ curpos += (int) _tcslen(szadd);
}
/** Append escaped control char to string str, and advance position curpos */
@@ -1311,7 +1311,7 @@
return;
if( nLineIndex2 >= m_panSubLines->GetSize() )
- nLineIndex2 = m_panSubLines->GetUpperBound();
+ nLineIndex2 = (int) m_panSubLines->GetUpperBound();
for( int i = nLineIndex1; i <= nLineIndex2; i++ )
if( i >= 0 && i < m_panSubLines->GetSize() )
Modified: branches/R2_14/Src/editlib/ccrystaltextview.h
===================================================================
--- branches/R2_14/Src/editlib/ccrystaltextview.h 2010-10-16 16:15:56 UTC (rev 7307)
+++ branches/R2_14/Src/editlib/ccrystaltextview.h 2010-10-16 19:08:36 UTC (rev 7308)
@@ -171,7 +171,7 @@
BOOL m_bPreparingToDrag;
BOOL m_bDraggingText;
BOOL m_bDragSelection, m_bWordSelection, m_bLineSelection;
- UINT m_nDragSelTimer;
+ UINT_PTR m_nDragSelTimer;
CPoint m_ptDrawSelStart, m_ptDrawSelEnd;
Modified: branches/R2_14/Src/editlib/ccrystaltextview2.cpp
===================================================================
--- branches/R2_14/Src/editlib/ccrystaltextview2.cpp 2010-10-16 16:15:56 UTC (rev 7307)
+++ branches/R2_14/Src/editlib/ccrystaltextview2.cpp 2010-10-16 19:08:36 UTC (rev 7308)
@@ -61,7 +61,7 @@
static char THIS_FILE[] = __FILE__;
#endif
-#define CRYSTAL_TIMER_DRAGSEL 1001
+static const UINT_PTR CRYSTAL_TIMER_DRAGSEL = 1001;
static LPTSTR NTAPI EnsureCharNext(LPCTSTR current)
{
@@ -169,21 +169,21 @@
LPCTSTR pszChars = GetLineChars (m_ptCursorPos.y);
int nPos = m_ptCursorPos.x;
int nPrevPos;
- while (nPos > 0 && xisspace (pszChars[nPrevPos = ::EnsureCharPrev(pszChars, pszChars + nPos) - pszChars]))
+ while (nPos > 0 && xisspace (pszChars[nPrevPos = (int) (::EnsureCharPrev(pszChars, pszChars + nPos) - pszChars)]))
nPos = nPrevPos;
if (nPos > 0)
{
- int nPrevPos = ::CharPrev(pszChars, pszChars + nPos) - pszChars;
+ int nPrevPos = (int) (::CharPrev(pszChars, pszChars + nPos) - pszChars);
nPos = nPrevPos;
if (xisalnum (pszChars[nPos]))
{
- while (nPos > 0 && (xisalnum (pszChars[nPrevPos = ::EnsureCharPrev(pszChars, pszChars + nPos) - pszChars])))
+ while (nPos > 0 && (xisalnum (pszChars[nPrevPos = (int) (::EnsureCharPrev(pszChars, pszChars + nPos) - pszChars)])))
nPos = nPrevPos;
}
else
{
- while (nPos > 0 && !xisalnum (pszChars[nPrevPos = ::EnsureCharPrev(pszChars, pszChars + nPos) - pszChars])
+ while (nPos > 0 && !xisalnum (pszChars[nPrevPos = (int) (::EnsureCharPrev(pszChars, pszChars + nPos) - pszChars)])
&& !xisspace (pszChars[nPrevPos]))
nPos = nPrevPos;
}
@@ -228,17 +228,17 @@
if (xisalnum (pszChars[nPos]))
{
while (nPos < nLength && xisalnum (pszChars[nPos]))
- nPos = ::EnsureCharNext(pszChars + nPos) - pszChars;
+ nPos = (int) (::EnsureCharNext(pszChars + nPos) - pszChars);
}
else
{
while (nPos < nLength && !xisalnum (pszChars[nPos])
&& !xisspace (pszChars[nPos]))
- nPos = ::EnsureCharNext(pszChars + nPos) - pszChars;
+ nPos = (int) (::EnsureCharNext(pszChars + nPos) - pszChars);
}
while (nPos < nLength && xisspace (pszChars[nPos]))
- nPos = ::EnsureCharNext(pszChars + nPos) - pszChars;
+ nPos = (int) (::EnsureCharNext(pszChars + nPos) - pszChars);
m_ptCursorPos.x = nPos;
m_nIdealCharPos = CalculateActualOffset (m_ptCursorPos.y, m_ptCursorPos.x);
@@ -531,7 +531,7 @@
{
if (!xisalnum (pszChars[pt.x]))
break;
- pt.x += ::CharNext (&pszChars[pt.x]) - &pszChars[pt.x];
+ pt.x += (int) (::CharNext (&pszChars[pt.x]) - &pszChars[pt.x]);
}
ASSERT_VALIDTEXTPOS (pt);
return pt;
@@ -545,7 +545,7 @@
int nPrevX = pt.x;
while (pt.x > 0)
{
- nPrevX -= &pszChars[pt.x] - ::CharPrev (pszChars, &pszChars[pt.x]);
+ nPrevX -= (int) (&pszChars[pt.x] - ::CharPrev (pszChars, &pszChars[pt.x]));
if (!xisalnum (pszChars[nPrevX]))
break;
pt.x = nPrevX;
@@ -1164,7 +1164,7 @@
LPTSTR pszData = (LPTSTR) GlobalLock (hData);
if (pszData != NULL)
{
- SIZE_T cbData = GlobalSize (hData);
+ UINT cbData = (UINT) GlobalSize (hData);
int cchText = cbData / sizeof(TCHAR) - 1;
if (cchText >= 0)
memcpy(text.GetBufferSetLength(cchText), pszData, cbData);
Modified: branches/R2_14/Src/editlib/registry.cpp
===================================================================
--- branches/R2_14/Src/editlib/registry.cpp 2010-10-16 16:15:56 UTC (rev 7307)
+++ branches/R2_14/Src/editlib/registry.cpp 2010-10-16 19:08:36 UTC (rev 7308)
@@ -149,7 +149,7 @@
DWORD dwRealCount = 0, dwLength;
for (pszString = pValData->pszString; *pszString; pszString += dwLength)
{
- dwLength = _tcslen (pszString) + 1;
+ dwLength = (DWORD) _tcslen (pszString) + 1;
dwRealCount++;
}
if (dwCount >= dwRealCount)
@@ -157,7 +157,7 @@
LPTSTR *pszDstString = pszStrings;
for (LPCTSTR pszString = pValData->pszString; *pszString; pszString += dwLength, pszDstString++)
{
- dwLength = _tcslen (pszString) + 1;
+ dwLength = (DWORD) _tcslen (pszString) + 1;
LPTSTR pszNewString = (LPTSTR) malloc (dwLength);
*pszDstString = pszNewString;
if (pszNewString)
@@ -193,7 +193,7 @@
DWORD dwRealCount = 0, dwLength;
for (pszString = pValData->pszString; *pszString; pszString += dwLength)
{
- dwLength = _tcslen (pszString) + 1;
+ dwLength = (DWORD) _tcslen (pszString) + 1;
dwRealCount++;
}
LPTSTR *pszNewStrings = (LPTSTR *) malloc (dwRealCount *sizeof (LPTSTR));
@@ -203,7 +203,7 @@
*pdwCount = dwRealCount;
for (pszString = pValData->pszString; *pszString; pszString += dwLength, pszNewStrings++)
{
- dwLength = _tcslen (pszString) + 1;
+ dwLength = (DWORD) _tcslen (pszString) + 1;
LPTSTR pszNewString = (LPTSTR) malloc (dwLength);
*pszNewStrings = pszNewString;
if (pszNewString)
@@ -296,7 +296,7 @@
RegValSetString (RegVal *pValData, LPCTSTR pszString)
{
ASSERT (pValData &&pszString);
- DWORD dwLength = _tcslen (pszString) + 1;
+ DWORD dwLength = (DWORD) _tcslen (pszString) + 1;
pValData->pszString = (LPTSTR) malloc (dwLength);
if (pValData->pszString)
{
@@ -318,7 +318,7 @@
{
for (i = 0; i < dwCount; i++)
{
- dwSize += _tcslen (pszStrings[i]) + 1;
+ dwSize += (DWORD) _tcslen (pszStrings[i]) + 1;
}
}
else
@@ -360,7 +360,7 @@
RegValSetStringArr (RegVal *pValData, const CStringArray &arrString)
{
ASSERT (pValData);
- DWORD i, dwSize = 1, dwCount = arrString.GetSize ();
+ DWORD i, dwSize = 1, dwCount = (DWORD) arrString.GetSize ();
if (dwCount)
{
for (i = 0; i < dwCount; i++)
@@ -821,7 +821,7 @@
HKEY hSubKey = pszSubKey ? RegCreate (hKey, pszSubKey, KEY_WRITE) : hKey;
if (hSubKey)
{
- if (RegSetValueEx (hSubKey, pszValName, 0, REG_SZ, (LPBYTE) pszString, _tcslen (pszString) + 1) == ERROR_SUCCESS)
+ if (RegSetValueEx (hSubKey, pszValName, 0, REG_SZ, (LPBYTE) pszString, (DWORD)_tcslen (pszString) + 1) == ERROR_SUCCESS)
{
if (hSubKey != hKey)
RegClose (hSubKey);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-16 16:16:03
|
Revision: 7307
http://winmerge.svn.sourceforge.net/winmerge/?rev=7307&view=rev
Author: gerundt
Date: 2010-10-16 16:15:56 +0000 (Sat, 16 Oct 2010)
Log Message:
-----------
PATCH: [ 3075470 ] Backport MSI setup to R2_14
Added Paths:
-----------
branches/R2_14/Docs/Developers/readme-WIX.html
branches/R2_14/Installer/WiX/
branches/R2_14/Installer/WiX/Bitmaps/
branches/R2_14/Installer/WiX/Bitmaps/banner.bmp
branches/R2_14/Installer/WiX/Bitmaps/dialog.bmp
branches/R2_14/Installer/WiX/Config.wxi
branches/R2_14/Installer/WiX/Fragments/
branches/R2_14/Installer/WiX/Fragments/Core.wxs
branches/R2_14/Installer/WiX/Fragments/Docs.wxs
branches/R2_14/Installer/WiX/Fragments/Features.wxs
branches/R2_14/Installer/WiX/Fragments/Filters.wxs
branches/R2_14/Installer/WiX/Fragments/Languages.wxs
branches/R2_14/Installer/WiX/Fragments/Plugins.wxs
branches/R2_14/Installer/WiX/Fragments/WixUI_AdditionalTasksDlg.wxs
branches/R2_14/Installer/WiX/Fragments/WixUI_WinMerge.wxs
branches/R2_14/Installer/WiX/WinMerge.wixproj
branches/R2_14/Installer/WiX/WinMerge.wxs
branches/R2_14/Installer/WiX/build.bat
Added: branches/R2_14/Docs/Developers/readme-WIX.html
===================================================================
--- branches/R2_14/Docs/Developers/readme-WIX.html (rev 0)
+++ branches/R2_14/Docs/Developers/readme-WIX.html 2010-10-16 16:15:56 UTC (rev 7307)
@@ -0,0 +1,220 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+ <title>Building WinMerge MSI Installer</title>
+ <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+ <style type="text/css">
+ <!--
+ body {
+ font-family: Verdana,Helvetica,Arial,sans-serif;
+ font-size: small;
+ }
+ code,pre {
+ font-family: "Courier New",Courier,monospace;
+ font-size: 1em;
+ }
+ h3 {
+ padding: 2px;
+ border-left: 4px solid #FFCC00;
+ border-bottom: 1px solid #FFCC00;
+ }
+ pre {
+ margin-left: 25px;
+ margin-right: 25px;
+ padding: 5px;
+ background-color: #EEEEEE;
+ border-left: 10px solid #CCCCCC;
+ }
+ p.note {
+ padding: 5px;
+ background-color: #DDDDFF;
+ border: 1px solid #6666FF;
+ }
+ -->
+ </style>
+</head>
+<body>
+
+<h2>Building WinMerge MSI Installer</h2>
+
+<p class="note">MSI installer is still in heavy development and is highly
+experimental. DO NOT use it to install WinMerge to production environment!
+</p>
+
+<h3>Needed programs:</h3>
+<ul>
+ <li>
+ <a href="http://wix.sourceforge.net/">Wix</a> version 3.0 or later.
+ </li>
+ <li>
+ <a href="http://msdn.microsoft.com/en-us/library/0k6kkbsd.aspx">MSBuild</a>.
+ MSBuild is part of .NET 2.0 or later SDK.
+ </li>
+</ul>
+
+<h3>Installer script:</h3>
+<p>The main installer script is in <code>Installer/WIX</code> folder:
+<code>WinMerge.wxs</code>. This file includes other needed files.</p>
+
+<h3>Folder structure and files needed:</h3>
+<p>First make sure you have all needed files compiled and available:</p>
+<ul>
+ <li>WinMerge executables: <code>WinMergeU.exe</code></li>
+ <li>Translation library: <code>MergeLang.dll</code></li>
+ <li>Executable translations: <code>/Translations/WinMerge/*.po</code></li>
+ <li>Libraries: <code>libexpat.dll</code> and <code>pcre.dll</code></li>
+ <li>Manual: <code>WinMerge.chm</code></li>
+ <li>ShellExtension: <code>ShellExtensionU.dll</code> and <code>ShellExtensionX64.dll</code></li>
+ <li>Documents: <code>/Docs/Users/*</code></li>
+ <li>Filters: <code>/Filters/*</code></li>
+</ul>
+
+<p>These files are produced by compiling WinMerge, documentation etc, but
+that's not subject of this document, refer to <a href="Compiling.html">Compiling.html</a>,
+<a href="readme-manual.html">readme-manual.html</a> and
+<a href="Translations.html">Translations.html</a>.</p>
+
+<p>In addition you will need Microsoft C- and MFC-runtime <em>merge modules</em>.
+Those files are not distributes with WinMerge. By default we use VS2008
+merge modules from the <code>%CommonProgramFiles%\Merge Modules</code> folder:</p>
+<ul>
+ <li><code>Microsoft_VC90_CRT_x86.msm</code></li>
+ <li><code>Microsoft_VC90_MFC_x86.msm</code></li>
+ <li><code>Microsoft_VC90_CRT_x86_x64.msm</code></li>
+ <li><code>Microsoft_VC90_MFC_x86_x64.msm</code></li>
+</ul>
+
+<h4>Folder structure</h4>
+
+<p>Copy or move the files into the following layout:</p>
+
+<ul>
+ <li>
+ <code>Build/</code>
+ <ul>
+ <li>
+ <code>expat</code>
+ <ul>
+ <li><code>libexpat.dll</code></li>
+ </ul>
+ </li>
+ <li>
+ <code>heksedit</code>
+ <ul>
+ <li><code>hekseditU.dll</code></li>
+ </ul>
+ </li>
+ <li>
+ <code>Manual/htmlhelp</code>
+ <ul>
+ <li><code>WinMerge.chm</code></li>
+ </ul>
+ </li>
+ <li>
+ <code>MergeUnicodeRelease/</code>
+ <ul>
+ <li><code>MergeLang.dll</code></li>
+ <li><code>ShellExtensionU.dll</code></li>
+ <li><code>WinMergeU.exe</code></li>
+ </ul>
+ </li>
+ <li>
+ <code>pcre/</code>
+ <ul>
+ <li><code>pcre.dll</code></li>
+ </ul>
+ </li>
+ <li>
+ <code>ShellExtensionX64/</code>
+ <ul>
+ <li><code>ShellExtensionX64.dll</code></li>
+ </ul>
+ </li>
+ </ul>
+ </li>
+ <li>
+ <code>Docs/</code>
+ <ul>
+ <li>
+ <code>Users</code>
+ <ul>
+ <li><em>Copy the entire <code>Docs/Users</code> folder to here</em></li>
+ </ul>
+ </li>
+ </ul>
+ </li>
+ <li>
+ <code>Filters/</code>
+ <ul>
+ <li><code>FileFilter.tmpl</code></li>
+ <li><code>*.flt</code></li>
+ </ul>
+ </li>
+ <li>
+ <code>Installer/</code>
+ <ul>
+ <li>
+ <code>WIX/</code>
+ <ul>
+ <li><em>Copy the entire <code>Installer/WIX</code> folder to here</em></li>
+ </ul>
+ </li>
+ </ul>
+ </li>
+ <li>
+ <code>Plugins/</code>
+ <ul>
+ <li>
+ <code>dlls/</code>
+ <ul>
+ <li><em>Copy the entire <code>Plugins/dlls</code> folder to here</em></li>
+ </ul>
+ </li>
+ </ul>
+ </li>
+ <li>
+ <code>Src/</code>
+ <ul>
+ <li>
+ <code>Languages/</code>
+ <ul>
+ <li><em>Copy the entire <code>Src/Languages</code> folder to here</em></li>
+ </ul>
+ </li>
+ </ul>
+ </li>
+</ul>
+
+<h3>Running WIX tools to create installer</h3>
+
+<p><code>WinMerge.wxs</code> (in <code>WIX</code> folder)
+is script used to create WinMerge MSI installer. Other tools and IDEs can
+be used also. For example WixEdit or SharpDevelop.</p>
+
+<h4>Building with MSBuild</h4>
+
+<p>Open the Visual Studio command prompt and CD to <code>Installer/WIX</code> -folder. Run
+command:
+<pre>
+ msbuild.exe WinMerge.wixproj
+</pre>
+There are two commonly used parameters:
+<ul>
+ <li>Platform: <code>/p:Platform=x86</code> or <code>/p:Platform=x64</code></li>
+ <li>Version: <code>/p:ProductVersion=x.x.x</code>. If the version number
+ is not given it is read from <code>Config.wxi</code>. But then filename
+ does not contain version number.</li>
+</ul>
+For example:
+<pre>
+ msbuild.exe WinMerge.wixproj /p:Platform=x86,ProductVersion=1.0.2
+</pre>
+
+<p>If the compile succeeds you have <code>WinMerge-[platform]-Setup.msi</code>
+files in <code>Build\WiX\Release\</code>folder's subfolders.
+
+<p><strong>Test installer!</strong></p>
+
+</body>
+</html>
\ No newline at end of file
Property changes on: branches/R2_14/Docs/Developers/readme-WIX.html
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Property changes on: branches/R2_14/Installer/WiX
___________________________________________________________________
Added: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Added: bugtraq:logregex
+ (\d{6,})
Property changes on: branches/R2_14/Installer/WiX/Bitmaps
___________________________________________________________________
Added: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Added: bugtraq:logregex
+ (\d{6,})
Added: branches/R2_14/Installer/WiX/Bitmaps/banner.bmp
===================================================================
(Binary files differ)
Property changes on: branches/R2_14/Installer/WiX/Bitmaps/banner.bmp
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/R2_14/Installer/WiX/Bitmaps/dialog.bmp
===================================================================
(Binary files differ)
Property changes on: branches/R2_14/Installer/WiX/Bitmaps/dialog.bmp
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/R2_14/Installer/WiX/Config.wxi
===================================================================
--- branches/R2_14/Installer/WiX/Config.wxi (rev 0)
+++ branches/R2_14/Installer/WiX/Config.wxi 2010-10-16 16:15:56 UTC (rev 7307)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include>
+ <?ifndef Platform ?> <!-- if platform NOT defined -->
+ <?define Platform = "x86" ?>
+ <?endif ?>
+ <?define Manufacturer = "Thingamahoochie Software" ?>
+ <?define ProductName = "WinMerge" ?>
+ <?ifndef ProductVersion ?> <!-- if product version NOT defined -->
+ <?define ProductVersion = "0.0.1" ?>
+ <?endif ?>
+
+ <?define PackageDescription = "WinMerge Installer" ?>
+ <?define PackageKeywords = "Installer" ?>
+ <?define PackageComments = "WinMerge" ?>
+
+ <?if $(var.Platform) = "x64" ?> <!-- if "x64" platform -->
+ <?define Win64 = "yes" ?>
+ <?define PackagePlatform = "x64" ?>
+ <?define UpgradeGuid = "79F16C51-8485-426E-BF23-F4D3D0D431D7" ?>
+
+ <?define ProgramFilesFolder = "ProgramFiles64Folder" ?>
+ <?define MergeBuildDir = "..\..\Build\x64\MergeRelease" ?>
+ <?define HekseditBuildDir = "..\..\Build\heksedit\x64\Release" ?>
+ <?define ExpatBuildDir = "..\..\Build\expat\lib\x64\Release" ?>
+ <?define PcreBuildDir = "..\..\Build\pcre\lib\x64\Release" ?>
+ <?define ShellExtBuildDir = "..\..\Build\ShellExtension\x64 release" ?>
+
+ <?define StartMenuShortcutsGuid = "CDC49AA0-DC37-439d-8358-68E2EA9EF909" ?>
+ <?define DesktopShortcutGuid = "CFF6BDA0-483F-496e-819F-0FC8874C2B9C" ?>
+
+ <?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC90_CRT_x86_x64.msm" ?>
+ <?define MfcMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC90_MFC_x86_x64.msm" ?>
+ <?else ?> <!-- if "x86" platform -->
+ <?define Win64 = "no" ?>
+ <?define PackagePlatform = "x86" ?>
+ <?define UpgradeGuid = "3C974FF6-9076-46EB-A65F-A53931EAF942" ?>
+
+ <?define ProgramFilesFolder = "ProgramFilesFolder" ?>
+ <?define MergeBuildDir = "..\..\Build\MergeUnicodeRelease" ?>
+ <?define ExpatBuildDir = "..\..\Build\expat" ?>
+ <?define HekseditBuildDir = "..\..\Build\heksedit" ?>
+ <?define PcreBuildDir = "..\..\Build\pcre" ?>
+ <?define ShellExtBuildDir = "..\..\Build\MergeUnicodeRelease" ?>
+
+ <?define StartMenuShortcutsGuid = "12413436-9929-453c-870B-03146CE11960" ?>
+ <?define DesktopShortcutGuid = "36035411-C6BE-43e8-B569-B1EC325D180C" ?>
+
+ <?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC90_CRT_x86.msm" ?>
+ <?define MfcMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC90_MFC_x86.msm" ?>
+ <?endif ?>
+</Include>
\ No newline at end of file
Property changes on: branches/R2_14/Installer/WiX/Config.wxi
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Property changes on: branches/R2_14/Installer/WiX/Fragments
___________________________________________________________________
Added: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Added: bugtraq:logregex
+ (\d{6,})
Added: branches/R2_14/Installer/WiX/Fragments/Core.wxs
===================================================================
--- branches/R2_14/Installer/WiX/Fragments/Core.wxs (rev 0)
+++ branches/R2_14/Installer/WiX/Fragments/Core.wxs 2010-10-16 16:15:56 UTC (rev 7307)
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <?include ..\Config.wxi ?>
+ <Fragment>
+ <DirectoryRef Id="INSTALLDIR">
+ <Component Id="WinMergeU" Guid="*" Win64="$(var.Win64)">
+ <File Id="WinMergeUEXE"
+ Name="WinMergeU.exe"
+ Source="$(var.MergeBuildDir)\WinMergeU.exe"
+ Vital="yes" />
+ </Component>
+
+ <Component Id="libexpat" Guid="*" Win64="$(var.Win64)">
+ <File Id="libexpatDLL"
+ Name="libexpat.dll"
+ Source="$(var.ExpatBuildDir)\libexpat.dll"
+ Vital="yes" />
+ </Component>
+
+ <Component Id="heksedit" Guid="*" Win64="$(var.Win64)">
+ <File Id="hekseditUDLL"
+ Name="hekseditU.dll"
+ Source="$(var.HekseditBuildDir)\hekseditU.dll"
+ Vital="yes" />
+ </Component>
+
+ <Component Id="pcre" Guid="*" Win64="$(var.Win64)">
+ <File Id="pcreDLL"
+ Name="pcre.dll"
+ Source="$(var.PcreBuildDir)\pcre.dll"
+ Vital="yes" />
+ </Component>
+
+ <Component Id="MergeLang" Guid="*" Win64="$(var.Win64)">
+ <File Id="MergeLangDLL"
+ Name="MergeLang.dll"
+ Source="$(var.MergeBuildDir)\MergeLang.dll"
+ Vital="yes" />
+ </Component>
+
+ <Component Id="Files" Guid="*" Win64="$(var.Win64)">
+ <File Id="FilesTXT"
+ Name="Files.txt"
+ Source="..\..\Docs\Users\Files.txt"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Contributors" Guid="*" Win64="$(var.Win64)">
+ <File Id="ContributorsTXT"
+ Name="Contributors.txt"
+ Source="..\..\Docs\Users\Contributors.txt"
+ Vital="no" />
+ </Component>
+ </DirectoryRef>
+
+ <!-- Shell Extension -->
+ <DirectoryRef Id="INSTALLDIR">
+ <Component Id="ShellExtension" Guid="*" Win64="$(var.Win64)">
+ <?if $(var.Platform) = "x64" ?>
+ <File Id="ShellExtensionX64DLL"
+ Name="ShellExtensionX64.dll"
+ SelfRegCost="1"
+ Source="$(var.ShellExtBuildDir)\ShellExtensionX64.dll"
+ Vital="yes" />
+ <?else ?>
+ <File Id="ShellExtensionUDLL"
+ Name="ShellExtensionU.dll"
+ SelfRegCost="1"
+ Source="$(var.ShellExtBuildDir)\ShellExtensionU.dll"
+ Vital="yes" />
+ <?endif ?>
+ </Component>
+ </DirectoryRef>
+
+ <!-- Startmenu shortcuts -->
+ <DirectoryRef Id="WinMergeMenuFolder">
+ <Component Id="StartMenuShortcuts" Guid="$(var.StartMenuShortcutsGuid)" Win64="$(var.Win64)">
+ <Condition>TASK_STARTMENUSHORTCUTS</Condition>
+ <Shortcut Id="WinMergeStartMenuShortcut"
+ Name="WinMerge"
+ Target="[INSTALLDIR]WinMergeU.exe"
+ WorkingDirectory="INSTALLDIR" />
+ <Shortcut Id="ReadMeStartMenuShortcut"
+ Name="Read Me"
+ Target="[INSTALLDIR]Docs\ReadMe.txt"
+ WorkingDirectory="INSTALLDIR" />
+ <Shortcut Id="HelpStartMenuShortcut"
+ Name="WinMerge Help"
+ Target="[INSTALLDIR]Docs\WinMerge.chm"
+ WorkingDirectory="INSTALLDIR" />
+ <RemoveFolder Id="WinMergeMenuFolder" On="uninstall" />
+ <RegistryValue Root="HKCU" Key="Software\Thingamahoochie\WinMerge" Name="Installed" Type="integer" Value="1" KeyPath="yes" />
+ </Component>
+ </DirectoryRef>
+
+ <!-- Desktop shortcut -->
+ <DirectoryRef Id="DesktopFolder">
+ <Component Id="DesktopShortcut" Guid="$(var.DesktopShortcutGuid)" Win64="$(var.Win64)">
+ <Condition>TASK_DESKTOPSHORTCUT</Condition>
+ <Shortcut Id="WinMergeDesktopShortcut"
+ Name="WinMerge"
+ Target="[INSTALLDIR]WinMergeU.exe"
+ WorkingDirectory="INSTALLDIR" />
+ <RegistryValue Root="HKCU" Key="Software\Thingamahoochie\WinMerge" Name="Installed" Type="integer" Value="1" KeyPath="yes" />
+ </Component>
+ </DirectoryRef>
+ </Fragment>
+</Wix>
Property changes on: branches/R2_14/Installer/WiX/Fragments/Core.wxs
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: branches/R2_14/Installer/WiX/Fragments/Docs.wxs
===================================================================
--- branches/R2_14/Installer/WiX/Fragments/Docs.wxs (rev 0)
+++ branches/R2_14/Installer/WiX/Fragments/Docs.wxs 2010-10-16 16:15:56 UTC (rev 7307)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <?include ..\Config.wxi ?>
+ <Fragment>
+ <DirectoryRef Id="DOCSDIR">
+ <Component Id="ReadMe" Guid="*" Win64="$(var.Win64)">
+ <File Id="ReadMeTXT"
+ Name="ReadMe.txt"
+ Source="..\..\Docs\Users\ReadMe.txt"
+ Vital="no" />
+ </Component>
+
+ <Component Id="ReleaseNotes" Guid="*" Win64="$(var.Win64)">
+ <File Id="ReleaseNotesHTML"
+ Name="ReleaseNotes.html"
+ Source="..\..\Docs\Users\ReleaseNotes.html"
+ Vital="no" />
+ </Component>
+
+ <Component Id="ChangeLog" Guid="*" Win64="$(var.Win64)">
+ <File Id="ChangeLogTXT"
+ Name="ChangeLog.txt"
+ Source="..\..\Docs\Users\ChangeLog.txt"
+ Vital="no" />
+ </Component>
+
+ <Component Id="WinMergeHelp" Guid="*" Win64="$(var.Win64)">
+ <File Id="WinMergeCHM"
+ Name="WinMerge.chm"
+ Source="..\..\Build\Manual\htmlhelp\WinMerge.chm"
+ Vital="no" />
+ </Component>
+ </DirectoryRef>
+ </Fragment>
+</Wix>
Property changes on: branches/R2_14/Installer/WiX/Fragments/Docs.wxs
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: branches/R2_14/Installer/WiX/Fragments/Features.wxs
===================================================================
--- branches/R2_14/Installer/WiX/Fragments/Features.wxs (rev 0)
+++ branches/R2_14/Installer/WiX/Fragments/Features.wxs 2010-10-16 16:15:56 UTC (rev 7307)
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <?include ..\Config.wxi ?>
+ <Fragment>
+ <!--
+ * Level <= 3 is "Typical"
+ * Level <= 1000 is "Complete"
+ -->
+ <Feature Id="WinMerge"
+ Absent="disallow"
+ AllowAdvertise="no"
+ ConfigurableDirectory="INSTALLDIR"
+ Display="expand"
+ Level="1"
+ Title="WinMerge">
+ <ComponentRef Id="WinMergeU" />
+ <ComponentRef Id="libexpat" />
+ <ComponentRef Id="pcre" />
+ <ComponentRef Id="heksedit" />
+ <ComponentRef Id="MergeLang" />
+ <ComponentRef Id="StartMenuShortcuts" />
+ <ComponentRef Id="DesktopShortcut" />
+ <Feature Id="ShellExtension"
+ AllowAdvertise="no"
+ Description="Explorer context menu integration"
+ Level="1"
+ Title="Shell Extension">
+ <ComponentRef Id="ShellExtension" />
+ </Feature>
+ <Feature Id="Documentation" Absent="disallow" AllowAdvertise="no" Display="hidden" Level="1" Title="Documentation">
+ <ComponentRef Id="Files" />
+ <ComponentRef Id="Contributors" />
+ <ComponentRef Id="ReadMe" />
+ <ComponentRef Id="ReleaseNotes" />
+ <ComponentRef Id="ChangeLog" />
+ <ComponentRef Id="WinMergeHelp" />
+ </Feature>
+ <Feature Id="Filters" AllowAdvertise="no" Level="1" Title="Filters">
+ <ComponentRef Id="ADAMulti" />
+ <ComponentRef Id="ASPNET" />
+ <ComponentRef Id="CSharp_loose" />
+ <ComponentRef Id="Delphi" />
+ <ComponentRef Id="FileFilter" />
+ <ComponentRef Id="Frontpage" />
+ <ComponentRef Id="MASM" />
+ <ComponentRef Id="Merge_GnuC_loose" />
+ <ComponentRef Id="Merge_VB_loose" />
+ <ComponentRef Id="Merge_VC_loose" />
+ <ComponentRef Id="SourceControl" />
+ <ComponentRef Id="Symbian" />
+ <ComponentRef Id="XML_html" />
+ </Feature>
+ <Feature Id="Languages" AllowAdvertise="no" Level="1" Title="Languages">
+ <ComponentRef Id="Brazilian" />
+ <ComponentRef Id="Bulgarian" />
+ <ComponentRef Id="Catalan" />
+ <ComponentRef Id="ChineseSimplified" />
+ <ComponentRef Id="ChineseTraditional" />
+ <ComponentRef Id="Croatian" />
+ <ComponentRef Id="Czech" />
+ <ComponentRef Id="Danish" />
+ <ComponentRef Id="Dutch" />
+ <ComponentRef Id="French" />
+ <ComponentRef Id="Galician" />
+ <ComponentRef Id="German" />
+ <ComponentRef Id="Greek" />
+ <ComponentRef Id="Hungarian" />
+ <ComponentRef Id="Italian" />
+ <ComponentRef Id="Japanese" />
+ <ComponentRef Id="Korean" />
+ <ComponentRef Id="Norwegian" />
+ <ComponentRef Id="Persian" />
+ <ComponentRef Id="Polish" />
+ <ComponentRef Id="Portuguese" />
+ <ComponentRef Id="Romanian" />
+ <ComponentRef Id="Russian" />
+ <ComponentRef Id="Serbian" />
+ <ComponentRef Id="Slovak" />
+ <ComponentRef Id="Slovenian" />
+ <ComponentRef Id="Spanish" />
+ <ComponentRef Id="Swedish" />
+ <ComponentRef Id="Turkish" />
+ <ComponentRef Id="Ukrainian" />
+ <ComponentRef Id="SetDefaultWinMergeLanguage" />
+ </Feature>
+ <?if not $(var.Platform) = "x64" ?>
+ <Feature Id="Plugins" AllowAdvertise="no" Level="4" Title="Plugins">
+ <ComponentRef Id="editoraddin" />
+ <ComponentRef Id="insertdatetime" />
+ <ComponentRef Id="CompareMSExcelFiles" />
+ <ComponentRef Id="CompareMSWordFiles" />
+ <ComponentRef Id="DisplayXMLFiles" />
+ <ComponentRef Id="IgnoreColumns" />
+ <ComponentRef Id="IgnoreCommentsC" />
+ <ComponentRef Id="IgnoreFieldsComma" />
+ <ComponentRef Id="IgnoreFieldsTab" />
+ <ComponentRef Id="IgnoreLeadingLineNumbers" />
+ <ComponentRef Id="WatchBeginningOfLog" />
+ <ComponentRef Id="WatchEndOfLog" />
+ </Feature>
+ <?endif ?>
+ <Feature Id="CRT" AllowAdvertise="no" Display="hidden" Level="1" Title="Microsoft Visual C++ 2005 Runtime Components ">
+ <MergeRef Id="CRT"/>
+ </Feature>
+ <Feature Id="MFC" AllowAdvertise="no" Display="hidden" Level="1" Title="Microsoft Visual C++ 2005 MFC Components ">
+ <MergeRef Id="MFC"/>
+ </Feature>
+ </Feature>
+ </Fragment>
+</Wix>
Property changes on: branches/R2_14/Installer/WiX/Fragments/Features.wxs
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: branches/R2_14/Installer/WiX/Fragments/Filters.wxs
===================================================================
--- branches/R2_14/Installer/WiX/Fragments/Filters.wxs (rev 0)
+++ branches/R2_14/Installer/WiX/Fragments/Filters.wxs 2010-10-16 16:15:56 UTC (rev 7307)
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <?include ..\Config.wxi ?>
+ <Fragment>
+ <DirectoryRef Id="FILTERSDIR">
+ <Component Id="ADAMulti" Guid="*" Win64="$(var.Win64)">
+ <File Id="ADAMultiFLT"
+ Name="ADAMulti.flt"
+ Source="..\..\Filters\ADAMulti.flt"
+ Vital="no" />
+ </Component>
+
+ <Component Id="ASPNET" Guid="*" Win64="$(var.Win64)">
+ <File Id="ASPNETFLT"
+ Name="ASPNET.flt"
+ Source="..\..\Filters\ASPNET.flt"
+ Vital="no" />
+ </Component>
+
+ <Component Id="CSharp_loose" Guid="*" Win64="$(var.Win64)">
+ <File Id="CSharp_looseFLT"
+ Name="CSharp_loose.flt"
+ Source="..\..\Filters\CSharp_loose.flt"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Delphi" Guid="*" Win64="$(var.Win64)">
+ <File Id="DelphiFLT"
+ Name="Delphi.flt"
+ Source="..\..\Filters\Delphi.flt"
+ Vital="no" />
+ </Component>
+
+ <Component Id="FileFilter" Guid="*" Win64="$(var.Win64)">
+ <File Id="FileFilterTMPL"
+ Name="FileFilter.tmpl"
+ Source="..\..\Filters\FileFilter.tmpl"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Frontpage" Guid="*" Win64="$(var.Win64)">
+ <File Id="FrontpageFLT"
+ Name="Frontpage.flt"
+ Source="..\..\Filters\Frontpage.flt"
+ Vital="no" />
+ </Component>
+
+ <Component Id="MASM" Guid="*" Win64="$(var.Win64)">
+ <File Id="MASMFLT"
+ Name="MASM.flt"
+ Source="..\..\Filters\MASM.flt"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Merge_GnuC_loose" Guid="*" Win64="$(var.Win64)">
+ <File Id="Merge_GnuC_looseFLT"
+ Name="Merge_GnuC_loose.flt"
+ Source="..\..\Filters\Merge_GnuC_loose.flt"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Merge_VB_loose" Guid="*" Win64="$(var.Win64)">
+ <File Id="Merge_VB_looseFLT"
+ Name="Merge_VB_loose.flt"
+ Source="..\..\Filters\Merge_VB_loose.flt"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Merge_VC_loose" Guid="*" Win64="$(var.Win64)">
+ <File Id="Merge_VC_looseFLT"
+ Name="Merge_VC_loose.flt"
+ Source="..\..\Filters\Merge_VC_loose.flt"
+ Vital="no" />
+ </Component>
+
+ <Component Id="SourceControl" Guid="*" Win64="$(var.Win64)">
+ <File Id="SourceControlFLT"
+ Name="SourceControl.flt"
+ Source="..\..\Filters\SourceControl.flt"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Symbian" Guid="*" Win64="$(var.Win64)">
+ <File Id="SymbianFLT"
+ Name="Symbian.flt"
+ Source="..\..\Filters\Symbian.flt"
+ Vital="no" />
+ </Component>
+
+ <Component Id="XML_html" Guid="*" Win64="$(var.Win64)">
+ <File Id="XML_htmlFLT"
+ Name="XML_html.flt"
+ Source="..\..\Filters\XML_html.flt"
+ Vital="no" />
+ </Component>
+ </DirectoryRef>
+ </Fragment>
+</Wix>
Property changes on: branches/R2_14/Installer/WiX/Fragments/Filters.wxs
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: branches/R2_14/Installer/WiX/Fragments/Languages.wxs
===================================================================
--- branches/R2_14/Installer/WiX/Fragments/Languages.wxs (rev 0)
+++ branches/R2_14/Installer/WiX/Fragments/Languages.wxs 2010-10-16 16:15:56 UTC (rev 7307)
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <?include ..\Config.wxi ?>
+ <Fragment>
+ <DirectoryRef Id="LANGDIR">
+ <Component Id="Brazilian" Guid="*" Win64="$(var.Win64)">
+ <File Id="BrazilianPO"
+ Name="Brazilian.po"
+ Source="..\..\Src\Languages\Brazilian.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Bulgarian" Guid="*" Win64="$(var.Win64)">
+ <File Id="BulgarianPO"
+ Name="Bulgarian.po"
+ Source="..\..\Src\Languages\Bulgarian.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Catalan" Guid="*" Win64="$(var.Win64)">
+ <File Id="CatalanPO"
+ Name="Catalan.po"
+ Source="..\..\Src\Languages\Catalan.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="ChineseSimplified" Guid="*" Win64="$(var.Win64)">
+ <File Id="ChineseSimplifiedPO"
+ Name="ChineseSimplified.po"
+ Source="..\..\Src\Languages\ChineseSimplified.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="ChineseTraditional" Guid="*" Win64="$(var.Win64)">
+ <File Id="ChineseTraditionalPO"
+ Name="ChineseTraditional.po"
+ Source="..\..\Src\Languages\ChineseTraditional.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Croatian" Guid="*" Win64="$(var.Win64)">
+ <File Id="CroatianPO"
+ Name="Croatian.po"
+ Source="..\..\Src\Languages\Croatian.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Czech" Guid="*" Win64="$(var.Win64)">
+ <File Id="CzechPO"
+ Name="Czech.po"
+ Source="..\..\Src\Languages\Czech.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Danish" Guid="*" Win64="$(var.Win64)">
+ <File Id="DanishPO"
+ Name="Danish.po"
+ Source="..\..\Src\Languages\Danish.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Dutch" Guid="*" Win64="$(var.Win64)">
+ <File Id="DutchPO"
+ Name="Dutch.po"
+ Source="..\..\Src\Languages\Dutch.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="French" Guid="*" Win64="$(var.Win64)">
+ <File Id="FrenchPO"
+ Name="French.po"
+ Source="..\..\Src\Languages\French.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Galician" Guid="*" Win64="$(var.Win64)">
+ <File Id="GalicianPO"
+ Name="Galician.po"
+ Source="..\..\Src\Languages\Galician.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="German" Guid="*" Win64="$(var.Win64)">
+ <File Id="GermanPO"
+ Name="German.po"
+ Source="..\..\Src\Languages\German.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Greek" Guid="*" Win64="$(var.Win64)">
+ <File Id="GreekPO"
+ Name="Greek.po"
+ Source="..\..\Src\Languages\Greek.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Hungarian" Guid="*" Win64="$(var.Win64)">
+ <File Id="HungarianPO"
+ Name="Hungarian.po"
+ Source="..\..\Src\Languages\Hungarian.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Italian" Guid="*" Win64="$(var.Win64)">
+ <File Id="ItalianPO"
+ Name="Italian.po"
+ Source="..\..\Src\Languages\Italian.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Japanese" Guid="*" Win64="$(var.Win64)">
+ <File Id="JapanesePO"
+ Name="Japanese.po"
+ Source="..\..\Src\Languages\Japanese.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Korean" Guid="*" Win64="$(var.Win64)">
+ <File Id="KoreanPO"
+ Name="Korean.po"
+ Source="..\..\Src\Languages\Korean.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Norwegian" Guid="*" Win64="$(var.Win64)">
+ <File Id="NorwegianPO"
+ Name="Norwegian.po"
+ Source="..\..\Src\Languages\Norwegian.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Polish" Guid="*" Win64="$(var.Win64)">
+ <File Id="PolishPO"
+ Name="Polish.po"
+ Source="..\..\Src\Languages\Polish.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Persian" Guid="*" Win64="$(var.Win64)">
+ <File Id="PersianPO"
+ Name="Persian.po"
+ Source="..\..\Src\Languages\Persian.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Portuguese" Guid="*" Win64="$(var.Win64)">
+ <File Id="PortuguesePO"
+ Name="Portuguese.po"
+ Source="..\..\Src\Languages\Portuguese.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Romanian" Guid="*" Win64="$(var.Win64)">
+ <File Id="RomanianPO"
+ Name="Romanian.po"
+ Source="..\..\Src\Languages\Romanian.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Russian" Guid="*" Win64="$(var.Win64)">
+ <File Id="RussianPO"
+ Name="Russian.po"
+ Source="..\..\Src\Languages\Russian.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Serbian" Guid="*" Win64="$(var.Win64)">
+ <File Id="SerbianPO"
+ Name="Serbian.po"
+ Source="..\..\Src\Languages\Serbian.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Slovak" Guid="*" Win64="$(var.Win64)">
+ <File Id="SlovakPO"
+ Name="Slovak.po"
+ Source="..\..\Src\Languages\Slovak.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Slovenian" Guid="*" Win64="$(var.Win64)">
+ <File Id="SlovenianPO"
+ Name="Slovenian.po"
+ Source="..\..\Src\Languages\Slovenian.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Spanish" Guid="*" Win64="$(var.Win64)">
+ <File Id="SpanishPO"
+ Name="Spanish.po"
+ Source="..\..\Src\Languages\Spanish.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Swedish" Guid="*" Win64="$(var.Win64)">
+ <File Id="SwedishPO"
+ Name="Swedish.po"
+ Source="..\..\Src\Languages\Swedish.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Turkish" Guid="*" Win64="$(var.Win64)">
+ <File Id="TurkishPO"
+ Name="Turkish.po"
+ Source="..\..\Src\Languages\Turkish.po"
+ Vital="no" />
+ </Component>
+
+ <Component Id="Ukrainian" Guid="*" Win64="$(var.Win64)">
+ <File Id="UkrainianPO"
+ Name="Ukrainian.po"
+ Source="..\..\Src\Languages\Ukrainian.po"
+ Vital="no" />
+ </Component>
+
+ <!-- Set the default WinMerge language -->
+ <Component Id="SetDefaultWinMergeLanguage" Guid="*" Win64="$(var.Win64)">
+ <!-- We just write the system language ID to the registry.
+ If WinMerge have no language with this ID, it will fall back to English!
+ This is a little bit lazy but also the easiest way! ;-) -->
+ <RegistryValue Root="HKLM" Key="Software\Thingamahoochie\WinMerge\Locale" Name="LanguageId" Type="integer" Value="[SystemLanguageID]" KeyPath="yes" />
+ </Component>
+ </DirectoryRef>
+ </Fragment>
+</Wix>
Property changes on: branches/R2_14/Installer/WiX/Fragments/Languages.wxs
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: branches/R2_14/Installer/WiX/Fragments/Plugins.wxs
===================================================================
--- branches/R2_14/Installer/WiX/Fragments/Plugins.wxs (rev 0)
+++ branches/R2_14/Installer/WiX/Fragments/Plugins.wxs 2010-10-16 16:15:56 UTC (rev 7307)
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <?include ..\Config.wxi ?>
+ <Fragment>
+ <?if not $(var.Platform) = "x64" ?>
+ <DirectoryRef Id="PLUGINSDIR">
+ <Component Id="editoraddin" Guid="*" Win64="no">
+ <File Id="editoraddinSCT"
+ Name="editor addin.sct"
+ Source="..\..\Plugins\dlls\editor addin.sct"
+ Vital="no" />
+ </Component>
+
+ <Component Id="insertdatetime" Guid="*" Win64="no">
+ <File Id="insertdatetimeSCT"
+ Name="insert datetime.sct"
+ Source="..\..\Plugins\dlls\insert datetime.sct"
+ Vital="no" />
+ </Component>
+
+ <Component Id="CompareMSExcelFiles" Guid="*" Win64="no">
+ <File Id="CompareMSExcelFilesDLL"
+ Name="CompareMSExcelFiles.dll"
+ Source="..\..\Plugins\dlls\CompareMSExcelFiles.dll"
+ Vital="no" />
+ </Component>
+
+ <Component Id="CompareMSWordFiles" Guid="*" Win64="no">
+ <File Id="CompareMSWordFilesDLL"
+ Name="CompareMSWordFiles.dll"
+ Source="..\..\Plugins\dlls\CompareMSWordFiles.dll"
+ Vital="no" />
+ </Component>
+
+ <Component Id="DisplayXMLFiles" Guid="*" Win64="no">
+ <File Id="DisplayXMLFilesDLL"
+ Name="DisplayXMLFiles.dll"
+ Source="..\..\Plugins\dlls\DisplayXMLFiles.dll"
+ Vital="no" />
+ </Component>
+
+ <Component Id="IgnoreColumns" Guid="*" Win64="no">
+ <File Id="IgnoreColumnsDLL"
+ Name="IgnoreColumns.dll"
+ Source="..\..\Plugins\dlls\IgnoreColumns.dll"
+ Vital="no" />
+ </Component>
+
+ <Component Id="IgnoreCommentsC" Guid="*" Win64="no">
+ <File Id="IgnoreCommentsCDLL"
+ Name="IgnoreCommentsC.dll"
+ Source="..\..\Plugins\dlls\IgnoreCommentsC.dll"
+ Vital="no" />
+ </Component>
+
+ <Component Id="IgnoreFieldsComma" Guid="*" Win64="no">
+ <File Id="IgnoreFieldsCommaDLL"
+ Name="IgnoreFieldsComma.dll"
+ Source="..\..\Plugins\dlls\IgnoreFieldsComma.dll"
+ Vital="no" />
+ </Component>
+
+ <Component Id="IgnoreFieldsTab" Guid="*" Win64="no">
+ <File Id="IgnoreFieldsTabDLL"
+ Name="IgnoreFieldsTab.dll"
+ Source="..\..\Plugins\dlls\IgnoreFieldsTab.dll"
+ Vital="no" />
+ </Component>
+
+ <Component Id="IgnoreLeadingLineNumbers" Guid="*" Win64="no">
+ <File Id="IgnoreLeadingLineNumbersDLL"
+ Name="IgnoreLeadingLineNumbers.dll"
+ Source="..\..\Plugins\dlls\IgnoreLeadingLineNumbers.dll"
+ Vital="no" />
+ </Component>
+
+ <Component Id="WatchBeginningOfLog" Guid="*" Win64="no">
+ <File Id="WatchBeginningOfLogDLL"
+ Name="WatchBeginningOfLog.dll"
+ Source="..\..\Plugins\dlls\WatchBeginningOfLog.dll"
+ Vital="no" />
+ </Component>
+
+ <Component Id="WatchEndOfLog" Guid="*" Win64="no">
+ <File Id="WatchEndOfLogDLL"
+ Name="WatchEndOfLog.dll"
+ Source="..\..\Plugins\dlls\WatchEndOfLog.dll"
+ Vital="no" />
+ </Component>
+ </DirectoryRef>
+ <?endif ?>
+ </Fragment>
+</Wix>
Property changes on: branches/R2_14/Installer/WiX/Fragments/Plugins.wxs
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: branches/R2_14/Installer/WiX/Fragments/WixUI_AdditionalTasksDlg.wxs
===================================================================
--- branches/R2_14/Installer/WiX/Fragments/WixUI_AdditionalTasksDlg.wxs (rev 0)
+++ branches/R2_14/Installer/WiX/Fragments/WixUI_AdditionalTasksDlg.wxs 2010-10-16 16:15:56 UTC (rev 7307)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) Microsoft Corporation. All rights reserved.
+
+ The use and distribution terms for this software are covered by the
+ Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+ which can be found in the file CPL.TXT at the root of this distribution.
+ By using this software in any fashion, you are agreeing to be bound by
+ the terms of this license.
+
+ You must not remove this notice, or any other, from this software.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <Fragment>
+ <UI>
+ <!-- TODO: Use to <WixLocalization>
+ <Dialog Id="AdditionalTasksDlg" Width="370" Height="270" Title="!(loc.AdditionalTasksDlg_Title)">
+ -->
+ <Dialog Id="AdditionalTasksDlg" Width="370" Height="270" Title="[ProductName] Setup">
+ <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" />
+ <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
+ <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+ <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+ </Control>
+
+ <!--<Control Id="SplitLine" Type="Line" X="0" Y="160" Width="370" Height="0" />-->
+ <Control Id="StartMenuShortcuts" Type="CheckBox" Height="18" Width="295" X="40" Y="70"
+ Text="Create the startmenu shortcuts"
+ Property="TASK_STARTMENUSHORTCUTS" CheckBoxValue="1" />
+ <Control Id="DesktopShortcut" Type="CheckBox" Height="18" Width="295" X="40" Y="90"
+ Text="Create a desktop shortcut"
+ Property="TASK_DESKTOPSHORTCUT" CheckBoxValue="1" />
+
+ <!-- TODO: Use to <WixLocalization>
+ <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.AdditionalTasksDlgDescription)" />
+ <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.AdditionalTasksDlgTitle)" />
+ <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.AdditionalTasksDlgBannerBitmap)" />
+ -->
+ <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="Which additional tasks should be performed?" />
+ <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="{\WixUI_Font_Title}Additional Tasks" />
+ <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="WixUI_Bmp_Banner" />
+ <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+ <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+ </Dialog>
+ </UI>
+ </Fragment>
+</Wix>
+
+<!-- TODO: Use to <WixLocalization>
+<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+ <String Id="AdditionalTasksDlg_Title">[ProductName] Setup</String>
+ <String Id="AdditionalTasksDlgTitle">{\WixUI_Font_Title}Additional Tasks</String>
+ <String Id="AdditionalTasksDlgDescription">...</String>
+ <String Id="AdditionalTasksDlgBannerBitmap">WixUI_Bmp_Banner</String>
+</WixLocalization>
+-->
\ No newline at end of file
Property changes on: branches/R2_14/Installer/WiX/Fragments/WixUI_AdditionalTasksDlg.wxs
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: branches/R2_14/Installer/WiX/Fragments/WixUI_WinMerge.wxs
===================================================================
--- branches/R2_14/Installer/WiX/Fragments/WixUI_WinMerge.wxs (rev 0)
+++ branches/R2_14/Installer/WiX/Fragments/WixUI_WinMerge.wxs 2010-10-16 16:15:56 UTC (rev 7307)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) Microsoft Corporation. All rights reserved.
+
+ The use and distribution terms for this software are covered by the
+ Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
+ which can be found in the file CPL.TXT at the root of this distribution.
+ By using this software in any fashion, you are agreeing to be bound by
+ the terms of this license.
+
+ You must not remove this notice, or any other, from this software.
+-->
+<!--
+First-time install dialog sequence: Maintenance dialog sequence:
+ - WixUI_WelcomeDlg - WixUI_MaintenanceWelcomeDlg
+ - WixUI_LicenseAgreementDlg - WixUI_MaintenanceTypeDlg
+ - WixUI_SetupTypeDlg - WixUI_CustomizeDlg
+ - WixUI_VerifyReadyDlg - WixUI_AdditionalTasksDlg
+ - WixUI_CustomizeDlg - WixUI_VerifyReadyDlg
+ - WixUI_DiskCostDlg
+ - WixUI_BrowseDlg
+ - WixUI_AdditionalTasksDlg
+-->
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <Fragment>
+ <UI Id="WixUI_WinMerge">
+ <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
+ <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
+ <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
+
+ <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
+ <Property Id="WixUI_Mode" Value="Mondo" />
+
+ <DialogRef Id="ErrorDlg" />
+ <DialogRef Id="FatalError" />
+ <DialogRef Id="FilesInUse" />
+ <DialogRef Id="MsiRMFilesInUse" />
+ <DialogRef Id="PrepareDlg" />
+ <DialogRef Id="ProgressDlg" />
+ <DialogRef Id="ResumeDlg" />
+ <DialogRef Id="UserExit" />
+
+ <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+
+ <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
+
+ <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
+ <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="SetupTypeDlg" Order="2">LicenseAccepted = "1"</Publish>
+
+ <Publish Dialog="SetupTypeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
+ <Publish Dialog="SetupTypeDlg" Control="TypicalButton" Event="NewDialog" Value="AdditionalTasksDlg">1</Publish>
+ <Publish Dialog="SetupTypeDlg" Control="CustomButton" Event="NewDialog" Value="CustomizeDlg">1</Publish>
+ <Publish Dialog="SetupTypeDlg" Control="CompleteButton" Event="NewDialog" Value="AdditionalTasksDlg">1</Publish>
+
+ <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1">WixUI_InstallMode = "Change"</Publish>
+ <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallCustom"</Publish>
+ <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="AdditionalTasksDlg">1</Publish>
+
+ <Publish Dialog="AdditionalTasksDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">WixUI_InstallMode = "InstallCustom"</Publish>
+ <Publish Dialog="AdditionalTasksDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete"</Publish>
+ <Publish Dialog="AdditionalTasksDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="3">WixUI_InstallMode = "Change"</Publish>
+ <Publish Dialog="AdditionalTasksDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="4">WixUI_InstallMode = "Repair" OR WixUI_InstallMode = "Remove"</Publish>
+ <Publish Dialog="AdditionalTasksDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">WixUI_InstallMode = "InstallCustom"</Publish>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete"</Publish>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="3">WixUI_InstallMode = "Change"</Publish>
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="4">WixUI_InstallMode = "Repair" OR WixUI_InstallMode = "Remove"</Publish>
+
+ <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
+
+ <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="CustomizeDlg">1</Publish>
+ <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+ <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+ <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
+ </UI>
+
+ <UIRef Id="WixUI_Common" />
+ </Fragment>
+</Wix>
\ No newline at end of file
Property changes on: branches/R2_14/Installer/WiX/Fragments/WixUI_WinMerge.wxs
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: branches/R2_14/Installer/WiX/WinMerge.wixproj
===================================================================
--- branches/R2_14/Installer/WiX/WinMerge.wixproj (rev 0)
+++ branches/R2_14/Installer/WiX/WinMerge.wixproj 2010-10-16 16:15:56 UTC (rev 7307)
@@ -0,0 +1,32 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <DefineSolutionProperties>false</DefineSolutionProperties>
+
+ <WixToolPath Condition="'$(WixToolPath)' == ''">$(PROGRAMFILES)\Windows Installer XML v3\bin\</WixToolPath>
+ <WixTargetsPath Condition="'$(WixTargetsPath)' == ''">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath>
+
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+
+ <OutputName Condition=" '$(ProductVersion)' != '' ">WinMerge-$(ProductVersion)-$(Platform)-Setup</OutputName>
+ <OutputName Condition=" '$(ProductVersion)' == '' ">WinMerge-$(Platform)-Setup</OutputName>
+ <OutputPath>..\..\Build\WiX\$(Configuration)\$(Platform)\</OutputPath>
+ <IntermediateOutputPath>..\..\BuildTmp\WiX\$(Configuration)\$(Platform)\</IntermediateOutputPath>
+ <OutputType>package</OutputType>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <WixExtension Include="$(WixToolPath)WixUIExtension.dll" />
+ <Compile Include="WinMerge.wxs"/>
+ <Compile Include="Fragments\Core.wxs"/>
+ <Compile Include="Fragments\Docs.wxs"/>
+ <Compile Include="Fragments\Filters.wxs"/>
+ <Compile Include="Fragments\Languages.wxs"/>
+ <Compile Include="Fragments\Plugins.wxs"/>
+ <Compile Include="Fragments\Features.wxs"/>
+ <Compile Include="Fragments\WixUI_WinMerge.wxs"/>
+ <Compile Include="Fragments\WixUI_AdditionalTasksDlg.wxs"/>
+ </ItemGroup>
+
+ <Import Project="$(WixTargetsPath)"/>
+</Project>
Property changes on: branches/R2_14/Installer/WiX/WinMerge.wixproj
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: branches/R2_14/Installer/WiX/WinMerge.wxs
===================================================================
--- branches/R2_14/Installer/WiX/WinMerge.wxs (rev 0)
+++ branches/R2_14/Installer/WiX/WinMerge.wxs 2010-10-16 16:15:56 UTC (rev 7307)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ candleArgs: "WinMerge.wxs" "Fragments\Core.wxs" "Fragments\Docs.wxs" "Fragments\Filters.wxs" "Fragments\Plugins.wxs" "Fragments\Languages.wxs" "Fragments\Features.wxs" "Fragments\WixUI_WinMerge.wxs" "Fragments\WixUI_AdditionalTasksDlg.wxs" <extensions>
+ lightArgs: "WinMerge.wixobj" "Core.wixobj" "Docs.wixobj" "Filters.wixobj" "Plugins.wixobj" "Languages.wixobj" "Features.wixobj" "WixUI_WinMerge.wixobj" "WixUI_AdditionalTasksDlg.wixobj" -ext WixUIExtension -out "<projectname>.msi" <extensions>
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <?include Config.wxi ?>
+ <!--
+ TODO:
+ * Tasks
+ * Shortcuts
+ * Quick Launch
+ * Integrate to...
+ * TortoiseCVS
+ * TortoiseSVN
+ * ClearCase
+ * Modify Path
+ * Don't install 32 bit version von Windows x64
+ * Install translated readme files
+ * Mutli-language support
+ * ...
+ -->
+ <Product Id="*"
+ Codepage="1252"
+ Language="1033"
+ Manufacturer="$(var.Manufacturer)"
+ Name="$(var.ProductName)"
+ UpgradeCode="$(var.UpgradeGuid)"
+ Version="$(var.ProductVersion)">
+
+ <Package Id="*"
+ Comments="$(var.PackageComments)"
+ Compressed="yes"
+ Description="$(var.Manufacturer)"
+ InstallerVersion="300"
+ Keywords="$(var.PackageKeywords)"
+ Languages="1033"
+ Manufacturer="$(var.PackageDescription)"
+ Platform="$(var.PackagePlatform)"
+ SummaryCodepage="1252" />
+
+ <Media Id="1"
+ Cabinet="winmerge.cab"
+ EmbedCab="yes" />
+
+ <Directory Id="TARGETDIR" Name="SourceDir">
+ <Directory Id="$(var.ProgramFilesFolder)">
+ <Directory Id="INSTALLDIR" Name="WinMerge">
+ <Directory Id="DOCSDIR" Name="Docs" />
+ <Directory Id="FILTERSDIR" Name="Filters" />
+ <Directory Id="LANGDIR" Name="Languages" />
+ <Directory Id="PLUGINSDIR" Name="MergePlugins" />
+ </Directory>
+ </Directory>
+ <Directory Id="ProgramMenuFolder">
+ <Directory Id="WinMergeMenuFolder" Name="WinMerge" />
+ </Directory>
+ <Directory Id="DesktopFolder" />
+ <Merge Id="CRT" Language="0" SourceFile="$(var.CrtMergeModule)" DiskId="1" />
+ <Merge Id="MFC" Language="0" SourceFile="$(var.MfcMergeModule)" DiskId="1" />
+ </Directory>
+
+ <Property Id="TASK_STARTMENUSHORTCUTS">1</Property>
+ <Property Id="TASK_DESKTOPSHORTCUT">1</Property>
+
+ <FeatureRef Id="WinMerge" />
+
+ <!-- TODO: Works this really? -->
+ <Condition Message="WinMerge requires Windows 2000/XP/2003/Vista/2008 or later to install.">
+ <![CDATA[( VersionNT <= 500 ) OR ( Version9x <> 0 )]]>
+ </Condition>
+
+ <WixVariable Id="WixUILicenseRtf" Value="..\..\Docs\users\GPL.rtf" />
+ <WixVariable Id="WixUIBannerBmp" Value="Bitmaps\banner.bmp" />
+ <WixVariable Id="WixUIDialogBmp" Value="Bitmaps\dialog.bmp" />
+
+ <UIRef Id="WixUI_WinMerge" />
+
+ <UI />
+
+ </Product>
+</Wix>
Property changes on: branches/R2_14/Installer/WiX/WinMerge.wxs
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: branches/R2_14/Installer/WiX/build.bat
===================================================================
--- branches/R2_14/Installer/WiX/build.bat (rev 0)
+++ branches/R2_14/Installer/WiX/build.bat 2010-10-16 16:15:56 UTC (rev 7307)
@@ -0,0 +1 @@
+"C:\Windows\Microsoft.NET\Framework\v2.0.50727\msbuild.exe" WinMerge.wixproj
Property changes on: branches/R2_14/Installer/WiX/build.bat
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-16 12:55:21
|
Revision: 7306
http://winmerge.svn.sourceforge.net/winmerge/?rev=7306&view=rev
Author: gerundt
Date: 2010-10-16 12:55:14 +0000 (Sat, 16 Oct 2010)
Log Message:
-----------
Use cscript for UpdatePoFilesFromPotFile.vbs in MergeLangX64.vcproj from R2_14
Modified Paths:
--------------
branches/R2_14/Src/MergeLangX64.vcproj
Modified: branches/R2_14/Src/MergeLangX64.vcproj
===================================================================
--- branches/R2_14/Src/MergeLangX64.vcproj 2010-10-16 12:10:24 UTC (rev 7305)
+++ branches/R2_14/Src/MergeLangX64.vcproj 2010-10-16 12:55:14 UTC (rev 7306)
@@ -97,7 +97,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -179,7 +179,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -258,7 +258,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -338,7 +338,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -419,7 +419,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -501,7 +501,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -580,7 +580,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -660,7 +660,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -741,7 +741,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -823,7 +823,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -902,7 +902,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
<Configuration
@@ -982,7 +982,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="pushd $(InputDir)\Languages
UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
+ CommandLine="pushd $(InputDir)\Languages
cscript UpdatePoFilesFromPotFile.vbs
popd
mkdir $(InputDir)..\Build\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\MergeUnicodeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeRelease\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\ 2> NUL
mkdir $(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\ 2> NUL
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\MergeUnicodeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeRelease\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeDebug\Languages\"
copy /Y "$(InputDir)Languages\*.po" "$(InputDir)..\Build\x64\MergeUnicodeRelease\Languages\"
"
/>
</Configuration>
</Configurations>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-16 12:10:31
|
Revision: 7305
http://winmerge.svn.sourceforge.net/winmerge/?rev=7305&view=rev
Author: gerundt
Date: 2010-10-16 12:10:24 +0000 (Sat, 16 Oct 2010)
Log Message:
-----------
Made MergeX64.vcproj compilable in R2_14
Modified Paths:
--------------
branches/R2_14/Src/MergeX64.vcproj
Modified: branches/R2_14/Src/MergeX64.vcproj
===================================================================
--- branches/R2_14/Src/MergeX64.vcproj 2010-10-15 07:21:38 UTC (rev 7304)
+++ branches/R2_14/Src/MergeX64.vcproj 2010-10-16 12:10:24 UTC (rev 7305)
@@ -4460,6 +4460,8 @@
Optimization="1"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
/>
</FileConfiguration>
<FileConfiguration
@@ -4483,6 +4485,8 @@
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
BrowseInformation="1"
/>
</FileConfiguration>
@@ -15576,6 +15580,10 @@
</FileConfiguration>
</File>
<File
+ RelativePath="PropShell.cpp"
+ >
+ </File>
+ <File
RelativePath="PropSyntaxColors.cpp"
>
<FileConfiguration
@@ -20984,6 +20992,10 @@
>
</File>
<File
+ RelativePath="PropShell.h"
+ >
+ </File>
+ <File
RelativePath="PropSyntaxColors.h"
>
</File>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-15 07:21:44
|
Revision: 7304
http://winmerge.svn.sourceforge.net/winmerge/?rev=7304&view=rev
Author: gerundt
Date: 2010-10-15 07:21:38 +0000 (Fri, 15 Oct 2010)
Log Message:
-----------
Drop ShellExtension.dll and WinMerge.exe from Files.txt in R2_14
Modified Paths:
--------------
branches/R2_14/Docs/Users/Files.txt
Modified: branches/R2_14/Docs/Users/Files.txt
===================================================================
--- branches/R2_14/Docs/Users/Files.txt 2010-10-15 07:20:49 UTC (rev 7303)
+++ branches/R2_14/Docs/Users/Files.txt 2010-10-15 07:21:38 UTC (rev 7304)
@@ -12,11 +12,9 @@
pcre.dll - library file for regular expressions
ReadMe.txt - Important information about WinMerge
Register.bat - batch file for installing ShellExtension to system
-ShellExtension.dll - ansi version of Shell integrarion dll
ShellExtensionU.dll - Unicode version of Shell integration dll
ShellExtensionX64.dll - 64-bit version of Shell integration dll
UnRegister.bat - batch file to uninstalling ShellExtension from system
-WinMerge.exe - ANSI version of WinMerge
WinMergeU.exe - Unicode version of WinMerge
Docs folder:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-15 07:20:55
|
Revision: 7303
http://winmerge.svn.sourceforge.net/winmerge/?rev=7303&view=rev
Author: gerundt
Date: 2010-10-15 07:20:49 +0000 (Fri, 15 Oct 2010)
Log Message:
-----------
Add "Denis Bradford" and fix "Hasan Osmanagi?\195?\166" in Contributors.txt in R2_14
Modified Paths:
--------------
branches/R2_14/Docs/Users/Contributors.txt
Modified: branches/R2_14/Docs/Users/Contributors.txt
===================================================================
--- branches/R2_14/Docs/Users/Contributors.txt 2010-10-15 07:18:48 UTC (rev 7302)
+++ branches/R2_14/Docs/Users/Contributors.txt 2010-10-15 07:20:49 UTC (rev 7303)
@@ -9,6 +9,7 @@
* Christian List <lis...@ho...>
Developers:
+* Denis Bradford <den...@us...>
* Tim Gerundt <ti...@ge...>
* Marcel Gosselin <mar...@us...>
* Gal Hammer <ga...@us...>
@@ -39,7 +40,7 @@
Koko <kok...@gi...>
* Croatian:
- Hasan Osmanag\xE6 <has...@pu...>
+ Hasan Osmanagi\xE6 <has...@pu...>
* Czech:
Jiri Tax <jt...@ta...>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-15 07:18:55
|
Revision: 7302
http://winmerge.svn.sourceforge.net/winmerge/?rev=7302&view=rev
Author: gerundt
Date: 2010-10-15 07:18:48 +0000 (Fri, 15 Oct 2010)
Log Message:
-----------
Merge CreateMasterPotFile.vbs and GetTranslationsStatus.vbs changes to R2_14
Modified Paths:
--------------
branches/R2_14/Src/Languages/CreateMasterPotFile.vbs
branches/R2_14/Src/Languages/GetTranslationsStatus.vbs
Modified: branches/R2_14/Src/Languages/CreateMasterPotFile.vbs
===================================================================
--- branches/R2_14/Src/Languages/CreateMasterPotFile.vbs 2010-10-08 16:12:20 UTC (rev 7301)
+++ branches/R2_14/Src/Languages/CreateMasterPotFile.vbs 2010-10-15 07:18:48 UTC (rev 7302)
@@ -2,7 +2,7 @@
''
' This script creates the master POT file (English.pot).
'
-' Copyright (C) 2007 by Tim Gerundt
+' Copyright (C) 2007-2009 by Tim Gerundt
' Released under the "GNU General Public License"
'
' ID line follows -- this is updated by SVN
@@ -17,6 +17,10 @@
Const VERSIONINFO_BLOCK = 4
Const ACCELERATORS_BLOCK = 5
+Const PATH_ENGLISH_POT = "English.pot"
+Const PATH_MERGE_RC = "../Merge.rc"
+Const PATH_MERGELANG_RC = "MergeLang.rc"
+
Dim oFSO, bRunFromCmd
Set oFSO = CreateObject("Scripting.FileSystemObject")
@@ -40,16 +44,16 @@
InfoBox "Creating POT file from Merge.rc...", 3
bNecessary = True
- If (oFSO.FileExists("English.pot") = True) And (oFSO.FileExists("MergeLang.rc") = True) Then 'If the POT and RC file exists...
- bNecessary = GetArchiveBit("../Merge.rc") Or GetArchiveBit("English.pot") Or GetArchiveBit("MergeLang.rc") 'RCs or POT file changed?
+ If (oFSO.FileExists(PATH_ENGLISH_POT) = True) And (oFSO.FileExists(PATH_MERGELANG_RC) = True) Then 'If the POT and RC file exists...
+ bNecessary = GetArchiveBit(PATH_MERGE_RC) Or GetArchiveBit(PATH_ENGLISH_POT) Or GetArchiveBit(PATH_MERGELANG_RC) 'RCs or POT file changed?
End If
If (bNecessary = True) Then 'If update necessary...
- Set oStrings = GetStringsFromRcFile("../Merge.rc", sCodePage)
- CreateMasterPotFile "English.pot", oStrings, sCodePage
- SetArchiveBit "../Merge.rc", False
- SetArchiveBit "English.pot", False
- SetArchiveBit "MergeLang.rc", False
+ Set oStrings = GetStringsFromRcFile(PATH_MERGE_RC, sCodePage)
+ CreateMasterPotFile PATH_ENGLISH_POT, oStrings, sCodePage
+ SetArchiveBit PATH_MERGE_RC, False
+ SetArchiveBit PATH_ENGLISH_POT, False
+ SetArchiveBit PATH_MERGELANG_RC, False
For Each oFile In oFSO.GetFolder(".").Files 'For all files in the current folder...
If (LCase(oFSO.GetExtensionName(oFile.Name)) = "po") Then 'If a PO file...
SetArchiveBit oFile.Path, True
@@ -241,7 +245,7 @@
oPotFile.WriteLine "msgid """""
oPotFile.WriteLine "msgstr """""
oPotFile.WriteLine """Project-Id-Version: WinMerge\n"""
- oPotFile.WriteLine """Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"""
+ oPotFile.WriteLine """Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"""
oPotFile.WriteLine """POT-Creation-Date: " & GetPotCreationDate() & "\n"""
oPotFile.WriteLine """PO-Revision-Date: \n"""
oPotFile.WriteLine """Last-Translator: \n"""
Modified: branches/R2_14/Src/Languages/GetTranslationsStatus.vbs
===================================================================
--- branches/R2_14/Src/Languages/GetTranslationsStatus.vbs 2010-10-08 16:12:20 UTC (rev 7301)
+++ branches/R2_14/Src/Languages/GetTranslationsStatus.vbs 2010-10-15 07:18:48 UTC (rev 7302)
@@ -83,7 +83,6 @@
Public Count, Translated, Untranslated, Fuzzy
Public PoRevisionDate, PotCreationDate
Public Translators
- Private Translator
Private Sub Class_Initialize
Count = 0
@@ -96,6 +95,8 @@
End Sub
Public Sub AddTranslator(ByVal sTranslator, ByVal bMaintainer)
+ Dim Translator
+
Set Translator = New CTranslator
Translator.Maintainer = bMaintainer
Translator.Mail = Trim(GetRegExpSubMatch(sTranslator, "<(.*)>"))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-08 16:12:27
|
Revision: 7301
http://winmerge.svn.sourceforge.net/winmerge/?rev=7301&view=rev
Author: gerundt
Date: 2010-10-08 16:12:20 +0000 (Fri, 08 Oct 2010)
Log Message:
-----------
PATCH: [ 3082392 ] Updated Bulgarian Language
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/Src/Languages/Bulgarian.po
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-08 16:11:19 UTC (rev 7300)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-08 16:12:20 UTC (rev 7301)
@@ -17,6 +17,7 @@
Bugfix: Location pane focus enabled "Save" (#3022292)
Bugfix: "Copy and advance" toolbar icons not automatically enabled (#3033325)
Translation updates:
+ - Bulgarian (#3082392)
- Chinese (#3033324)
- Dutch (#2804979)
- French (#2850842, #2968200)
Modified: branches/R2_14/Src/Languages/Bulgarian.po
===================================================================
--- branches/R2_14/Src/Languages/Bulgarian.po 2010-10-08 16:11:19 UTC (rev 7300)
+++ branches/R2_14/Src/Languages/Bulgarian.po 2010-10-08 16:12:20 UTC (rev 7301)
@@ -13,7 +13,7 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2008-05-04 21:51+0100\n"
+"PO-Revision-Date: 2010-10-06 22:09+0200\n"
"Last-Translator: tigertron <ivg_18 at yahoo.com>\n"
"Language-Team: Bulgarian <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -286,7 +286,7 @@
#: Merge.rc:454
#, c-format
msgid "&List..."
-msgstr ""
+msgstr "&\xD1\xEF\xE8\xF1\xFA\xEA..."
#: Merge.rc:152
#: Merge.rc:273
@@ -504,17 +504,17 @@
#: Merge.rc:224
#, c-format
msgid "Tree &Mode"
-msgstr ""
+msgstr "\xD0\xE5\xE6\xE8\xEC &\xC4\xFA\xF0\xE2\xEE"
#: Merge.rc:225
#, c-format
msgid "E&xpand All Subfolders"
-msgstr ""
+msgstr "&\xD0\xE0\xE7\xE3\xFA\xF0\xED\xE8 \xE2\xF1\xE8\xF7\xEA\xE8 \xEF\xEE\xE4\xEF\xE0\xEF\xEA\xE8"
#: Merge.rc:226
#, c-format
msgid "&Collapse All Subfolders"
-msgstr ""
+msgstr "&\xD1\xFA\xE1\xE5\xF0\xE8 \xE2\xF1\xE8\xF7\xEA\xE8 \xEF\xEE\xE4\xEF\xE0\xEF\xEA\xE8"
#: Merge.rc:239
#, c-format
@@ -652,17 +652,17 @@
#: Merge.rc:342
#, c-format
msgid "&Windows (CRLF)"
-msgstr ""
+msgstr "&Windows (CRLF)"
#: Merge.rc:343
#, c-format
msgid "&Unix (LF)"
-msgstr ""
+msgstr "&Unix (LF)"
#: Merge.rc:344
#, c-format
msgid "&Mac (CR)"
-msgstr ""
+msgstr "&Mac (CR)"
#: Merge.rc:347
#, c-format
@@ -1063,7 +1063,7 @@
#: Merge.rc:668
#, c-format
msgid "(Private Build)"
-msgstr ""
+msgstr "(\xC2\xFA\xF2\xF0\xE5\xF8\xED\xE0 \xE2\xE5\xF0\xF1\xE8\xFF)"
#: Merge.rc:669
#, c-format
@@ -1194,7 +1194,7 @@
#: Merge.rc:715
#, c-format
msgid "Visual SourceSafe"
-msgstr ""
+msgstr "\xC2\xE8\xE7\xF3\xE0\xEB\xE5\xED SourceSafe"
#: Merge.rc:720
#, c-format
@@ -1298,7 +1298,7 @@
#: Merge.rc:774
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr ""
+msgstr "\xCF\xEE\xEA\xE0\xE6\xE8 \xEF\xF0\xEE\xE7\xEE\xF0\xE5\xF6\xE0 \"\xC8\xE7\xE1\xE5\xF0\xE8 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xE8\xEB\xE8 \xEF\xE0\xEF\xEA\xE8\" \xEF\xF0\xE8 \xF1\xF2\xE0\xF0\xF2\xE8\xF0\xE0\xED\xE5"
#: Merge.rc:776
#, c-format
@@ -1441,7 +1441,7 @@
#: Merge.rc:2187
#, c-format
msgid "Rational ClearCase"
-msgstr ""
+msgstr "\xD0\xE0\xF6\xE8\xEE\xED\xE0\xEB\xE5\xED ClearCase"
#: Merge.rc:869
#, c-format
@@ -1841,7 +1841,7 @@
#: Merge.rc:1164
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr ""
+msgstr "&\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xE9 \xE2\xF0\xFA\xF9\xE0\xED\xE8\xF2\xE5 \xF0\xE0\xE7\xEB\xE8\xEA\xE8 \xE7\xE0 \xF4\xEE\xF0\xEC\xE0\xF2\xE0 (Windows/Unix/Mac)"
#: Merge.rc:1167
#, c-format
@@ -2023,8 +2023,12 @@
#: Merge.rc:1271
#, c-format
-msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
+msgid ""
+"Detect codepage info for these files: .html, .rc, .xml \n"
+"need to restart session"
msgstr ""
+"\xCE\xF2\xEA\xF0\xE8\xE9 \xE8\xED\xF4\xEE\xF0\xEC\xE0\xF6\xE8\xFF \xE7\xE0 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0\xF2\xE0 \xED\xE0 \xF1\xEB\xE5\xE4\xED\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xEE\xE2\xE5: .html, .rc, .xml \n"
+"\xED\xE5\xEE\xE1\xF5\xEE\xE4\xE8\xEC\xEE \xE5 \xF0\xE5\xF1\xF2\xE0\xF0\xF2\xE8\xF0\xE0\xED\xE5 \xED\xE0 \xF1\xE5\xF1\xE8\xFF\xF2\xE0"
#: Merge.rc:1274
#, c-format
@@ -2039,7 +2043,7 @@
#: Merge.rc:1278
#, c-format
msgid "Custom codepage:"
-msgstr ""
+msgstr "\xC7\xE0\xE4\xE0\xE9 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0:"
#: Merge.rc:1286
#, c-format
@@ -2102,7 +2106,7 @@
#: Merge.rc:1306
#, c-format
msgid "Merge7z000U.dll"
-msgstr ""
+msgstr "Merge7z000U.dll"
#: Merge.rc:1309
#, c-format
@@ -2137,8 +2141,12 @@
#: Merge.rc:1320
#, c-format
-msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
-msgstr "\xCD\xE5 \xEF\xEE\xEA\xE0\xE7\xE2\xE0\xE9 \xEF\xE0\xEA \xF2\xEE\xE2\xE0 \xF1\xFA\xEE\xE1\xF9\xE5\xED\xE8\xE5.\n(\xC2\xE8\xED\xE0\xE3\xE8 \xEC\xEE\xE6\xE5\xF2\xE5 \xE4\xE0 \xE3\xEE \xE8\xE7\xE2\xE8\xEA\xE0\xF2\xE5 \xEE\xF2 \xEC\xE5\xED\xFE \xCF\xEE\xEC\xEE\xF9.)"
+msgid ""
+"Don't display this &message again.\n"
+"(You can always recall this message from the Help menu.)"
+msgstr ""
+"\xCD\xE5 \xEF\xEE\xEA\xE0\xE7\xE2\xE0\xE9 \xEF\xE0\xEA \xF2\xEE\xE2\xE0 \xF1\xFA\xEE\xE1\xF9\xE5\xED\xE8\xE5.\n"
+"(\xC2\xE8\xED\xE0\xE3\xE8 \xEC\xEE\xE6\xE5\xF2\xE5 \xE4\xE0 \xE3\xEE \xE8\xE7\xE2\xE8\xEA\xE0\xF2\xE5 \xEE\xF2 \xEC\xE5\xED\xFE \xCF\xEE\xEC\xEE\xF9.)"
#: Merge.rc:1324
#, c-format
@@ -2578,23 +2586,23 @@
#: Merge.rc:1657
#, c-format
msgid "Plugins"
-msgstr ""
+msgstr "\xC4\xEE\xE1\xE0\xE2\xEA\xE8"
#: Merge.rc:1660
#, c-format
msgid "&Enable plugins"
-msgstr ""
+msgstr "&\xC2\xEA\xEB\xFE\xF7\xE8 \xE4\xEE\xE1\xE0\xE2\xEA\xE8\xF2\xE5"
#: Merge.rc:1671
#: Merge.rc:1952
#, c-format
msgid "Shell Integration"
-msgstr ""
+msgstr "\xC8\xED\xF2\xE5\xE3\xF0\xE8\xF0\xE0\xED\xE5 \xE2 \xF8\xE5\xEB-\xE0"
#: Merge.rc:1674
#, c-format
msgid "Explorer"
-msgstr ""
+msgstr "Explorer"
#: Merge.rc:1675
#, c-format
@@ -2609,17 +2617,17 @@
#: Merge.rc:1679
#, c-format
msgid "&Add to context menu"
-msgstr ""
+msgstr "&\xC4\xEE\xE1\xE0\xE2\xE8 \xE2 \xEA\xEE\xED\xF2\xE5\xEA\xF1\xF2\xED\xEE\xF2\xEE \xEC\xE5\xED\xFE"
#: Merge.rc:1681
#, c-format
msgid "Folder compare"
-msgstr ""
+msgstr "\xD1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xED\xE0 \xEF\xE0\xEF\xEA\xE8"
#: Merge.rc:1682
#, c-format
msgid "Add &Shell menu to context menu"
-msgstr ""
+msgstr "\xC4\xEE\xE1\xE0\xE2\xE8 \xF0\xE5\xE4 \xE2 \xEA\xEE\xED\xF2\xE5\xEA\xF1\xF2\xED\xEE\xF2\xEE \xEC\xE5\xED\xFE"
#. StringFileInfo.Block
#: Merge.rc:1708
@@ -2641,32 +2649,32 @@
#: Merge.rc:1745
#, c-format
msgid "EXT"
-msgstr ""
+msgstr "EXT"
#: Merge.rc:1746
#, c-format
msgid "CAP"
-msgstr ""
+msgstr "CAP"
#: Merge.rc:1747
#, c-format
msgid "NUM"
-msgstr ""
+msgstr "NUM"
#: Merge.rc:1748
#, c-format
msgid "SCRL"
-msgstr ""
+msgstr "SCRL"
#: Merge.rc:1749
#, c-format
msgid "OVR"
-msgstr ""
+msgstr "OVR"
#: Merge.rc:1750
#, c-format
msgid "REC"
-msgstr ""
+msgstr "REC"
#: Merge.rc:1756
#, c-format
@@ -2757,17 +2765,17 @@
#: Merge.rc:1770
#, c-format
msgid "Toggle tree mode"
-msgstr ""
+msgstr "\xCF\xF0\xE5\xE2\xEA\xEB\xFE\xF7\xE8 \xED\xE0 \xE4\xFA\xF0\xE2\xEE\xE2\xE8\xE4\xE5\xED \xF0\xE5\xE6\xE8\xEC"
#: Merge.rc:1771
#, c-format
msgid "Expand all subfolders"
-msgstr ""
+msgstr "\xD0\xE0\xE7\xE3\xFA\xF0\xED\xE8 \xE2\xF1\xE8\xF7\xEA\xE8 \xEF\xEE\xE4\xEF\xE0\xEF\xEA\xE8"
#: Merge.rc:1772
#, c-format
msgid "Collapse all subfolders"
-msgstr ""
+msgstr "\xD1\xFA\xE1\xE5\xF0\xE8 \xE2\xF1\xE8\xF7\xEA\xE8 \xEF\xEE\xE4\xEF\xE0\xEF\xEA\xE8"
#: Merge.rc:1778
#, c-format
@@ -2878,22 +2886,22 @@
"\xCF\xEE\xE4\xF0\xE5\xE4\xE8 \xCA\xE0\xF1\xEA\xE0\xE4\xED\xEE"
#: Merge.rc:1824
-#, fuzzy, c-format
+#, c-format
msgid ""
"Arrange windows as non-overlapping tiles horizontally\n"
"Tile Windows Horizontally"
msgstr ""
-"\xCF\xEE\xE4\xF0\xE5\xE6\xE4\xE0 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xE1\xE5\xE7 \xE4\xE0 \xF1\xE5 \xEF\xEE\xEA\xF0\xE8\xE2\xE0\xF2\n"
-"\xCF\xEE\xE4\xF0\xE5\xE4\xE8 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5"
+"\xCF\xEE\xE4\xF0\xE5\xE6\xE4\xE0 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xF5\xEE\xF0\xE8\xE7\xEE\xED\xF2\xE0\xEB\xED\xEE \xE1\xE5\xE7 \xE4\xE0 \xF1\xE5 \xEF\xEE\xEA\xF0\xE8\xE2\xE0\xF2\n"
+"\xCF\xEE\xE4\xF0\xE5\xE4\xE8 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xF5\xEE\xF0\xE8\xE7\xEE\xED\xF2\xE0\xEB\xED\xEE"
#: Merge.rc:1825
-#, fuzzy, c-format
+#, c-format
msgid ""
"Arrange windows as non-overlapping tiles vertically\n"
"Tile Windows Vertically"
msgstr ""
-"\xCF\xEE\xE4\xF0\xE5\xE6\xE4\xE0 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xE1\xE5\xE7 \xE4\xE0 \xF1\xE5 \xEF\xEE\xEA\xF0\xE8\xE2\xE0\xF2\n"
-"\xCF\xEE\xE4\xF0\xE5\xE4\xE8 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5"
+"\xCF\xEE\xE4\xF0\xE5\xE6\xE4\xE0 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xE2\xE5\xF0\xF2\xE8\xEA\xE0\xEB\xED\xEE \xE1\xE5\xE7 \xE4\xE0 \xF1\xE5 \xEF\xEE\xEA\xF0\xE8\xE2\xE0\xF2\n"
+"\xCF\xEE\xE4\xF0\xE5\xE4\xE8 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xE2\xE5\xF0\xF2\xE8\xEA\xE0\xEB\xED\xEE"
#: Merge.rc:1831
#, c-format
@@ -3005,8 +3013,12 @@
#: Merge.rc:1848
#, c-format
-msgid "Automatically resize panes\nLock Panes"
-msgstr "\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xF7\xED\xEE \xEE\xF0\xE0\xE7\xEC\xE5\xF0\xE8 \xEF\xE0\xED\xE5\xEB\xE8\xF2\xE5\n\xC7\xE0\xEA\xEB\xFE\xF7\xE8 \xEF\xE0\xED\xE5\xEB\xE8\xF2\xE5"
+msgid ""
+"Automatically resize panes\n"
+"Lock Panes"
+msgstr ""
+"\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xF7\xED\xEE \xEE\xF0\xE0\xE7\xEC\xE5\xF0\xE8 \xEF\xE0\xED\xE5\xEB\xE8\xF2\xE5\n"
+"\xC7\xE0\xEA\xEB\xFE\xF7\xE8 \xEF\xE0\xED\xE5\xEB\xE8\xF2\xE5"
#: Merge.rc:1854
#, c-format
@@ -3069,13 +3081,41 @@
#: Merge.rc:1880
#, c-format
-msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
+msgid ""
+"\n"
+"FileCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FileCompare\n"
+"WinMerge File Compare"
msgstr ""
+"\n"
+"FileCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FileCompare\n"
+"WinMerge \xF1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xED\xE0 \xF4\xE0\xE9\xEB\xEE\xE2\xE5"
#: Merge.rc:1881
#, c-format
-msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
+msgid ""
+"\n"
+"FolderCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FolderCompare\n"
+"WinMerge Folder Compare"
msgstr ""
+"\n"
+"FolderCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FolderCompare\n"
+"WinMerge \xF1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xED\xE0 \xEF\xE0\xEF\xEA\xE8"
#: Merge.rc:1888
#, c-format
@@ -3095,8 +3135,12 @@
#: Merge.rc:1908
#, c-format
-msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
-msgstr "\xD0\xE0\xE7\xF0\xE0\xE1\xEE\xF2\xF7\xE8\xF6\xE8:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
+msgid ""
+"Developers:\n"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
+msgstr ""
+"\xD0\xE0\xE7\xF0\xE0\xE1\xEE\xF2\xF7\xE8\xF6\xE8:\n"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
#: Merge.rc:1909
#, c-format
@@ -3226,7 +3270,7 @@
#: Merge.rc:1971
#, c-format
msgid "X64"
-msgstr ""
+msgstr "X64"
#: Merge.rc:1977
#, c-format
@@ -3313,22 +3357,22 @@
#: Merge.rc:2009
#, c-format
msgid "UTF-8"
-msgstr ""
+msgstr "UTF-8"
#: Merge.rc:2010
#, c-format
msgid "UTF-8 (B)"
-msgstr ""
+msgstr "UTF-8 (B)"
#: Merge.rc:2011
#, c-format
msgid "UCS-2 LE"
-msgstr ""
+msgstr "UCS-2 LE"
#: Merge.rc:2012
#, c-format
msgid "UCS-2 BE"
-msgstr ""
+msgstr "UCS-2 BE"
#: Merge.rc:2018
#, c-format
@@ -3374,7 +3418,7 @@
#: Merge.rc:2031
#, c-format
msgid "[F] "
-msgstr ""
+msgstr "[F] "
#: Merge.rc:2032
#: Merge.rc:2655
@@ -3470,13 +3514,19 @@
#: Merge.rc:2059
#, c-format
-msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
+msgid ""
+"Filters were updated. Do you want to refresh all open folder compares?\n"
+"\n"
+"If you do not want to refresh all compares now you can select No and refresh compares later."
msgstr ""
+"\xD4\xE8\xEB\xF2\xF0\xE8\xF2\xE5 \xE1\xFF\xF5\xE0 \xEE\xE1\xED\xEE\xE2\xE5\xED\xE8. \xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEE\xEF\xF0\xE5\xF1\xED\xE8\xF2\xE5 \xE2\xF1\xE8\xF7\xEA\xE8 \xEE\xF2\xE2\xEE\xF0\xE5\xED\xE8 \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xFF \xED\xE0 \xEF\xE0\xEF\xEA\xE8?\n"
+"\n"
+"\xC0\xEA\xEE \xED\xE5 \xE8\xF1\xEA\xE0\xF2\xE5 \xE4\xE0 \xEE\xEF\xF0\xE5\xF1\xED\xE8\xF2\xE5 \xE2\xF1\xE8\xF7\xEA\xE8 \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xFF \xF1\xE5\xE3\xE0, \xEC\xEE\xE6\xE5\xF2\xE5 \xE4\xE0 \xED\xE0\xF2\xE8\xF1\xED\xE5\xF2\xE5 \xCD\xE5 \xE8 \xE4\xE0 \xE3\xE8 \xEE\xEF\xF0\xE5\xF1\xED\xE8\xF2\xE5 \xEF\xEE-\xEA\xFA\xF1\xED\xEE."
#: Merge.rc:2066
#, c-format
msgid "&Path to SS.EXE:"
-msgstr ""
+msgstr "&\xCF\xFA\xF2 \xE4\xEE SS.EXE:"
#: Merge.rc:2072
#, c-format
@@ -3561,12 +3611,12 @@
#: Merge.rc:2093
#, c-format
msgid "Undoing the last operation..."
-msgstr ""
+msgstr "\xCE\xF2\xEC\xE5\xED\xFF\xED\xE5 \xED\xE0 \xEF\xEE\xF1\xEB\xE5\xE4\xED\xEE\xF2\xEE \xE4\xE5\xE9\xF1\xF2\xE2\xE8\xE5..."
#: Merge.rc:2094
#, c-format
msgid "Redoing the previous operation..."
-msgstr ""
+msgstr "\xCF\xEE\xE2\xF2\xE0\xF0\xFF\xED\xE5 \xED\xE0 \xEF\xF0\xE5\xE4\xE8\xF8\xED\xEE\xF2\xEE \xE4\xE5\xE9\xF1\xF2\xE2\xE8\xE5..."
#: Merge.rc:2100
#, c-format
@@ -3689,8 +3739,14 @@
#: Merge.rc:2137
#, c-format
-msgid "The file\n%1\nis not a conflict file."
-msgstr "\xD4\xE0\xE9\xEB\xFA\xF2\n%1\n\xED\xE5 \xE5 \xEA\xEE\xED\xF4\xEB\xE8\xEA\xF2\xE5\xED."
+msgid ""
+"The file\n"
+"%1\n"
+"is not a conflict file."
+msgstr ""
+"\xD4\xE0\xE9\xEB\xFA\xF2\n"
+"%1\n"
+"\xED\xE5 \xE5 \xEA\xEE\xED\xF4\xEB\xE8\xEA\xF2\xE5\xED."
#: Merge.rc:2143
#, c-format
@@ -3803,8 +3859,18 @@
#: Merge.rc:2155
#, c-format
-msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
+msgid ""
+"Another application has updated file\n"
+"%1\n"
+"since WinMerge scanned it last time.\n"
+"\n"
+"Do you want to reload the file?"
msgstr ""
+"\xC4\xF0\xF3\xE3\xEE \xEF\xF0\xE8\xEB\xEE\xE6\xE5\xED\xE8\xE5 \xE5 \xEE\xE1\xED\xEE\xE2\xE8\xEB\xEE \xF4\xE0\xE9\xEB\xE0\n"
+"%1\n"
+"\xF1\xEB\xE5\xE4 \xEF\xEE\xF1\xEB\xE5\xE4\xED\xEE\xF2\xEE \xF1\xEA\xE0\xED\xE8\xF0\xE0\xED\xE5 \xEE\xF2 WinMerge.\n"
+"\n"
+"\xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEE\xF2\xE2\xEE\xF0\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xE0 \xED\xE0\xED\xEE\xE2\xEE?"
#: Merge.rc:2156
#, c-format
@@ -3818,8 +3884,14 @@
#: Merge.rc:2158
#, c-format
-msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
+msgid ""
+"The file\n"
+"%1\n"
+"has disappeared. Please save a copy of the file to continue."
msgstr ""
+"\xD4\xE0\xE9\xEB\xFA\xF2\n"
+"%1\n"
+"\xE5 \xE8\xE7\xF7\xE5\xE7\xED\xE0\xEB. \xCC\xEE\xEB\xFF, \xE7\xE0\xEF\xE8\xF8\xE5\xF2\xE5 \xED\xE5\xE3\xEE\xE2\xEE \xEA\xEE\xEF\xE8\xE5, \xE7\xE0 \xE4\xE0 \xEF\xF0\xEE\xE4\xFA\xEB\xE6\xE8\xF2\xE5."
#: Merge.rc:2164
#, c-format
@@ -4092,17 +4164,17 @@
#: Merge.rc:2241
#, c-format
msgid "Are you sure you want to move:"
-msgstr ""
+msgstr "\xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEF\xF0\xE5\xEC\xE5\xF1\xF2\xE8\xF2\xE5:"
#: Merge.rc:2242
#, c-format
msgid "Are you sure you want to move %d items:"
-msgstr ""
+msgstr "\xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEF\xF0\xE5\xEC\xE5\xF1\xF2\xE8\xF2\xE5 %d :"
#: Merge.rc:2244
#, c-format
msgid "Confirm Move"
-msgstr ""
+msgstr "\xCF\xEE\xF2\xE2\xFA\xF0\xE4\xE5\xF2\xE5 \xEF\xF0\xE5\xEC\xE5\xF1\xF2\xE2\xE0\xED\xE5"
#: Merge.rc:2250
#, c-format
@@ -4167,12 +4239,12 @@
#: Merge.rc:2267
#, c-format
msgid "Left Shell menu"
-msgstr ""
+msgstr "\xCB\xFF\xE2\xEE \xEC\xE5\xED\xFE"
#: Merge.rc:2268
#, c-format
msgid "Right Shell menu"
-msgstr ""
+msgstr "\xC4\xFF\xF1\xED\xEE \xEC\xE5\xED\xFE"
#: Merge.rc:2274
#, c-format
@@ -4383,7 +4455,7 @@
#: Merge.rc:2338
#, c-format
msgid "Folders are different"
-msgstr ""
+msgstr "\xCF\xE0\xEF\xEA\xE8\xF2\xE5 \xF1\xE0 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8"
#: Merge.rc:2339
#, c-format
@@ -4403,12 +4475,12 @@
#: Merge.rc:2343
#, c-format
msgid "Text files are identical"
-msgstr ""
+msgstr "\xD2\xE5\xEA\xF1\xF2\xEE\xE2\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xF1\xE0 \xE5\xE4\xED\xE0\xEA\xE2\xE8"
#: Merge.rc:2348
#, c-format
msgid "Text files are different"
-msgstr ""
+msgstr "\xD2\xE5\xEA\xF1\xF2\xEE\xE2\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xF1\xE0 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8"
#: Merge.rc:2354
#, c-format
@@ -4631,8 +4703,14 @@
#: Merge.rc:2421
#, c-format
-msgid "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
-msgstr "\xD1\xE8\xEC\xE2\xEE\xEB\xE8\xF2\xE5 EOL \xF1\xE0 \xEE\xF2 \xF0\xE0\xE7\xEB\xE8\xF7\xE5\xED \xF2\xE8\xEF (Windows/Unix/Mac) \xE2\xFA\xE2 \xF4\xE0\xE9\xEB\xE0 '%1'.\n \xD1 \xF2\xE5\xEA\xF3\xF9\xE8\xF2\xE5 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8 \xF2\xE5 \xF9\xE5 \xE1\xFA\xE4\xE0\xF2 \xF3\xE5\xE4\xED\xE0\xEA\xE2\xE5\xED\xE8 \xF1 \xEE\xF1\xED\xEE\xE2\xED\xE8\xFF\xF2 \xF2\xE8\xEF.\n \xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEF\xF0\xEE\xEC\xE5\xED\xE8\xF2\xE5 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8\xF2\xE5, \xE7\xE0 \xE4\xE0 \xF1\xE5 \xEF\xF0\xE5\xE4\xEF\xE0\xE7\xE8\xF2\xE5 \xEE\xF2 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8 EOL ?"
+msgid ""
+"The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
+" With the current options, they will be unified to the main type.\n"
+" Do you want to change the options and preserve the different EOL ?"
+msgstr ""
+"\xD1\xE8\xEC\xE2\xEE\xEB\xE8\xF2\xE5 EOL \xF1\xE0 \xEE\xF2 \xF0\xE0\xE7\xEB\xE8\xF7\xE5\xED \xF2\xE8\xEF (Windows/Unix/Mac) \xE2\xFA\xE2 \xF4\xE0\xE9\xEB\xE0 '%1'.\n"
+" \xD1 \xF2\xE5\xEA\xF3\xF9\xE8\xF2\xE5 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8 \xF2\xE5 \xF9\xE5 \xE1\xFA\xE4\xE0\xF2 \xF3\xE5\xE4\xED\xE0\xEA\xE2\xE5\xED\xE8 \xF1 \xEE\xF1\xED\xEE\xE2\xED\xE8\xFF\xF2 \xF2\xE8\xEF.\n"
+" \xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEF\xF0\xEE\xEC\xE5\xED\xE8\xF2\xE5 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8\xF2\xE5, \xE7\xE0 \xE4\xE0 \xF1\xE5 \xEF\xF0\xE5\xE4\xEF\xE0\xE7\xE8\xF2\xE5 \xEE\xF2 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8 EOL ?"
#: Merge.rc:2422
#, c-format
@@ -4651,8 +4729,18 @@
#: Merge.rc:2425
#, c-format
-msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?"
-msgstr "\xCF\xE0\xEF\xEA\xE0\xF2\xE0 \xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0 \xF1\xE0\xEC\xEE \xE2 \xE4\xF0\xF3\xE3\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0 \xE8 \xED\xE5 \xEC\xEE\xE6\xE5 \xE4\xE0 \xF1\xE5 \xEE\xF2\xE2\xEE\xF0\xE8.\n\n\xC8\xF1\xEA\xE0\xF2 \xEB\xE8 \xE4\xE0 \xF1\xFA\xE7\xE4\xE0\xE4\xE5\xF2\xE5 \xF1\xFA\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xE0\xF9\xE8 \xEF\xE0\xEF\xEA\xE8:\n%1\n\xE2 \xE4\xF0\xF3\xE3\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0 \xE8 \xE4\xE0 \xE3\xE8 \xEE\xF2\xE2\xEE\xF0\xE8\xF2\xE5?"
+msgid ""
+"The folder exists only in other side and cannot be opened.\n"
+"\n"
+"Do you want to create a matching folder:\n"
+"%1\n"
+"to the other side and open these folders?"
+msgstr ""
+"\xCF\xE0\xEF\xEA\xE0\xF2\xE0 \xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0 \xF1\xE0\xEC\xEE \xE2 \xE4\xF0\xF3\xE3\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0 \xE8 \xED\xE5 \xEC\xEE\xE6\xE5 \xE4\xE0 \xF1\xE5 \xEE\xF2\xE2\xEE\xF0\xE8.\n"
+"\n"
+"\xC8\xF1\xEA\xE0\xF2 \xEB\xE8 \xE4\xE0 \xF1\xFA\xE7\xE4\xE0\xE4\xE5\xF2\xE5 \xF1\xFA\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xE0\xF9\xE8 \xEF\xE0\xEF\xEA\xE8:\n"
+"%1\n"
+"\xE2 \xE4\xF0\xF3\xE3\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0 \xE8 \xE4\xE0 \xE3\xE8 \xEE\xF2\xE2\xEE\xF0\xE8\xF2\xE5?"
#: Merge.rc:2431
#, c-format
@@ -5235,17 +5323,17 @@
#: Merge.rc:2629
#, c-format
msgid "Win"
-msgstr ""
+msgstr "Win"
#: Merge.rc:2630
#, c-format
msgid "Mac"
-msgstr ""
+msgstr "Mac"
#: Merge.rc:2631
#, c-format
msgid "Unix"
-msgstr ""
+msgstr "Unix"
#: Merge.rc:2632
#, c-format
@@ -5255,17 +5343,17 @@
#: Merge.rc:2634
#, c-format
msgid "LF"
-msgstr ""
+msgstr "LF"
#: Merge.rc:2635
#, c-format
msgid "CR"
-msgstr ""
+msgstr "CR"
#: Merge.rc:2636
#, c-format
msgid "CRLF"
-msgstr ""
+msgstr "CRLF"
#: Merge.rc:2643
#, c-format
@@ -5300,22 +5388,22 @@
#: Merge.rc:2654
#, c-format
msgid "Type"
-msgstr ""
+msgstr "\xD2\xE8\xEF"
#: Merge.rc:2656
#, c-format
msgid "Unpacker"
-msgstr ""
+msgstr "\xD0\xE0\xE7\xE0\xF0\xF5\xE8\xE2\xE0\xF2\xEE\xF0"
#: Merge.rc:2657
#, c-format
msgid "Prediffer"
-msgstr ""
+msgstr "\xCF\xF0\xE5\xE4\xE8\xF8\xED\xE0 \xD0\xE0\xE7\xEB\xE8\xEA\xE0"
#: Merge.rc:2658
#, c-format
msgid "Editor script"
-msgstr ""
+msgstr "\xD1\xEA\xF0\xE8\xEF\xF2 \xED\xE0 \xF0\xE5\xE4\xE0\xEA\xF2\xEE\xF0\xE0"
#: Merge.rc:2665
#, c-format
@@ -5340,12 +5428,12 @@
#: Merge.rc:2669
#, c-format
msgid "Change left side file/folder read-only status"
-msgstr ""
+msgstr "\xCF\xF0\xEE\xEC\xE5\xED\xE8 \xF1\xF2\xE0\xF2\xF3\xF1\xE0 \xF1\xE0\xEC\xEE \xE7\xE0 \xF7\xE5\xF2\xE5\xED\xE5 \xED\xE0 \xF4\xE0\xE9\xEB\xE0/\xEF\xE0\xEF\xEA\xE0\xF2\xE0 \xEE\xF2 \xEB\xFF\xE2\xEE"
#: Merge.rc:2670
#, c-format
msgid "Change right side file/folder read-only status"
-msgstr ""
+msgstr "\xCF\xF0\xEE\xEC\xE5\xED\xE8 \xF1\xF2\xE0\xF2\xF3\xF1\xE0 \xF1\xE0\xEC\xEE \xE7\xE0 \xF7\xE5\xF2\xE5\xED\xE5 \xED\xE0 \xF4\xE0\xE9\xEB\xE0/\xEF\xE0\xEF\xEA\xE0\xF2\xE0 \xEE\xF2 \xE4\xFF\xF1\xED\xEE"
#: Merge.rc:2671
#, c-format
@@ -5541,13 +5629,21 @@
#: Merge.rc:2714
#, c-format
-msgid "Select the current user interface language\nLanguage"
-msgstr "\xC8\xE7\xE1\xEE\xF0 \xED\xE0 \xF2\xE5\xEA\xF3\xF9 \xEF\xEE\xF2\xF0\xE5\xE1\xE8\xF2\xE5\xEB\xF1\xEA\xE8 \xE8\xED\xF2\xE5\xF0\xF4\xE5\xE9\xF1\n\xC5\xE7\xE8\xEA"
+msgid ""
+"Select the current user interface language\n"
+"Language"
+msgstr ""
+"\xC8\xE7\xE1\xEE\xF0 \xED\xE0 \xF2\xE5\xEA\xF3\xF9 \xEF\xEE\xF2\xF0\xE5\xE1\xE8\xF2\xE5\xEB\xF1\xEA\xE8 \xE8\xED\xF2\xE5\xF0\xF4\xE5\xE9\xF1\n"
+"\xC5\xE7\xE8\xEA"
#: Merge.rc:2715
#, c-format
-msgid "Shows differences inside lines with different colors\nShow Line Difference"
-msgstr "\xCF\xEE\xEA\xE0\xE7\xE2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE8\xF2\xE5 \xE2 \xF0\xE5\xE4\xEE\xE2\xE5\xF2\xE5 \xF1 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8 \xF6\xE2\xE5\xF2\xEE\xE2\xE5\n\xCF\xEE\xEA\xE0\xE6\xE8 \xF0\xE0\xE7\xEB\xE8\xF7\xE8\xFF\xF2\xE0 \xE2 \xF0\xE5\xE4\xE0"
+msgid ""
+"Shows differences inside lines with different colors\n"
+"Show Line Difference"
+msgstr ""
+"\xCF\xEE\xEA\xE0\xE7\xE2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE8\xF2\xE5 \xE2 \xF0\xE5\xE4\xEE\xE2\xE5\xF2\xE5 \xF1 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8 \xF6\xE2\xE5\xF2\xEE\xE2\xE5\n"
+"\xCF\xEE\xEA\xE0\xE6\xE8 \xF0\xE0\xE7\xEB\xE8\xF7\xE8\xFF\xF2\xE0 \xE2 \xF0\xE5\xE4\xE0"
#: Merge.rc:2716
#, c-format
@@ -5598,28 +5694,48 @@
#: Merge.rc:2728
#, c-format
-msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
-msgstr "\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xEF\xF0\xE5\xE4\xE8\xF8\xED\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n\xCF\xF0\xE5\xE4\xE8\xF8\xED\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Up)"
+msgid ""
+"Scroll to the previous difference\n"
+"Previous Difference (Alt+Up)"
+msgstr ""
+"\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xEF\xF0\xE5\xE4\xE8\xF8\xED\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n"
+"\xCF\xF0\xE5\xE4\xE8\xF8\xED\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Up)"
#: Merge.rc:2729
#, c-format
-msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
-msgstr "\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xF1\xEB\xE5\xE4\xE2\xE0\xF9\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n\xD1\xEB\xE5\xE4\xE2\xE0\xF9\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Down)"
+msgid ""
+"Scroll to the next difference\n"
+"Next Difference (Alt+Down)"
+msgstr ""
+"\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xF1\xEB\xE5\xE4\xE2\xE0\xF9\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n"
+"\xD1\xEB\xE5\xE4\xE2\xE0\xF9\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Down)"
#: Merge.rc:2730
#, c-format
-msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
-msgstr "\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xEF\xFA\xF0\xE2\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n\xCF\xFA\xF0\xE2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Home)"
+msgid ""
+"Scroll to the first difference\n"
+"First Difference (Alt+Home)"
+msgstr ""
+"\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xEF\xFA\xF0\xE2\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n"
+"\xCF\xFA\xF0\xE2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Home)"
#: Merge.rc:2731
#, c-format
-msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
-msgstr "\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xF2\xE5\xEA\xF3\xF9\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n\xD2\xE5\xEA\xF3\xF9\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Enter)"
+msgid ""
+"Scroll to the current difference\n"
+"Current Difference (Alt+Enter)"
+msgstr ""
+"\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xF2\xE5\xEA\xF3\xF9\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n"
+"\xD2\xE5\xEA\xF3\xF9\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Enter)"
#: Merge.rc:2732
#, c-format
-msgid "Scroll to the last difference\nLast Difference (Alt+End)"
-msgstr "\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xEF\xEE\xF1\xEB\xE5\xE4\xED\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n\xCF\xEE\xF1\xEB\xE5\xE4\xED\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+End)"
+msgid ""
+"Scroll to the last difference\n"
+"Last Difference (Alt+End)"
+msgstr ""
+"\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xEF\xEE\xF1\xEB\xE5\xE4\xED\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n"
+"\xCF\xEE\xF1\xEB\xE5\xE4\xED\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+End)"
#: Merge.rc:2733
#, c-format
@@ -5708,7 +5824,7 @@
#: Merge.rc:2755
#, c-format
msgid "Shows a list of available plugins"
-msgstr ""
+msgstr "\xCF\xEE\xEA\xE0\xE7\xE2\xE0 \xF1\xEF\xE8\xF1\xFA\xEA \xF1 \xED\xE0\xEB\xE8\xF7\xED\xE8\xF2\xE5 \xE4\xEE\xE1\xE0\xE2\xEA\xE8"
#: Merge.rc:2756
#, c-format
@@ -5747,8 +5863,12 @@
#: Merge.rc:2768
#, c-format
-msgid "Activates next visible file\nActivate next File"
-msgstr "\xC0\xEA\xF2\xE8\xE2\xE8\xF0\xE0 \xF1\xEB\xE5\xE4\xE2\xE0\xF9\xE8\xFF\xF2 \xE2\xE8\xE4\xE8\xEC \xF4\xE0\xE9\xEB\n\xC0\xEA\xF2\xE8\xE2\xE8\xF0\xE0\xE9 \xF1\xEB\xE5\xE4\xE2\xE0\xF9 \xF4\xE0\xE9\xEB"
+msgid ""
+"Activates next visible file\n"
+"Activate next File"
+msgstr ""
+"\xC0\xEA\xF2\xE8\xE2\xE8\xF0\xE0 \xF1\xEB\xE5\xE4\xE2\xE0\xF9\xE8\xFF\xF2 \xE2\xE8\xE4\xE8\xEC \xF4\xE0\xE9\xEB\n"
+"\xC0\xEA\xF2\xE8\xE2\xE8\xF0\xE0\xE9 \xF1\xEB\xE5\xE4\xE2\xE0\xF9 \xF4\xE0\xE9\xEB"
#: Merge.rc:2769
#, c-format
@@ -5757,8 +5877,12 @@
#: Merge.rc:2775
#, c-format
-msgid "Opens the WinMerge Help\nWinMerge Help"
-msgstr "\xCE\xF2\xE2\xE0\xF0\xFF \xEF\xEE\xEC\xEE\xF9\xF2\xE0 \xED\xE0 WinMerge\nWinMerge \xEF\xEE\xEC\xEE\xF9"
+msgid ""
+"Opens the WinMerge Help\n"
+"WinMerge Help"
+msgstr ""
+"\xCE\xF2\xE2\xE0\xF0\xFF \xEF\xEE\xEC\xEE\xF9\xF2\xE0 \xED\xE0 WinMerge\n"
+"WinMerge \xEF\xEE\xEC\xEE\xF9"
#: Merge.rc:2776
#, c-format
@@ -5777,13 +5901,21 @@
#: Merge.rc:2779
#, c-format
-msgid "Opens the release notes document\nRelease Notes"
-msgstr "\xCE\xF2\xE2\xE0\xF0\xFF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0 \xF1 \xE1\xE5\xEB\xE5\xE6\xEA\xE8 \xE7\xE0 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE0\xF2\xE0\n\xC1\xE5\xEB\xE5\xE6\xEA\xE8"
+msgid ""
+"Opens the release notes document\n"
+"Release Notes"
+msgstr ""
+"\xCE\xF2\xE2\xE0\xF0\xFF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0 \xF1 \xE1\xE5\xEB\xE5\xE6\xEA\xE8 \xE7\xE0 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE0\xF2\xE0\n"
+"\xC1\xE5\xEB\xE5\xE6\xEA\xE8"
#: Merge.rc:2780
#, c-format
-msgid "Opens the translations website\nTranslations"
-msgstr "\xCE\xF2\xE2\xE0\xF0\xFF \xF1\xF2\xF0\xE0\xED\xE8\xF6\xE0\xF2\xE0 \xF1 \xEF\xF0\xE5\xE2\xEE\xE4\xE8\n\xCF\xF0\xE5\xE2\xEE\xE4\xE8"
+msgid ""
+"Opens the translations website\n"
+"Translations"
+msgstr ""
+"\xCE\xF2\xE2\xE0\xF0\xFF \xF1\xF2\xF0\xE0\xED\xE8\xF6\xE0\xF2\xE0 \xF1 \xEF\xF0\xE5\xE2\xEE\xE4\xE8\n"
+"\xCF\xF0\xE5\xE2\xEE\xE4\xE8"
#: Merge.rc:2786
#, c-format
@@ -5878,117 +6010,117 @@
#: Merge.rc:2825
#, c-format
msgid "No Highlighting"
-msgstr ""
+msgstr "\xC1\xE5\xE7 \xEE\xF6\xE2\xE5\xF2\xFF\xE2\xE0\xED\xE5"
#: Merge.rc:2826
#, c-format
msgid "ASP"
-msgstr ""
+msgstr "ASP"
#: Merge.rc:2827
#, c-format
msgid "Basic"
-msgstr "\xCE\xF1\xED\xEE\xE2\xE5\xED"
+msgstr "Basic"
#: Merge.rc:2828
#, c-format
msgid "Batch"
-msgstr ""
+msgstr "Batch"
#: Merge.rc:2829
#, c-format
msgid "C/C++"
-msgstr ""
+msgstr "C/C++"
#: Merge.rc:2830
#, c-format
msgid "C#"
-msgstr ""
+msgstr "C#"
#: Merge.rc:2831
#, c-format
msgid "CSS"
-msgstr ""
+msgstr "CSS"
#: Merge.rc:2832
#, c-format
msgid "DCL"
-msgstr ""
+msgstr "DCL"
#: Merge.rc:2833
#, c-format
msgid "Fortran"
-msgstr ""
+msgstr "Fortran"
#: Merge.rc:2834
#, c-format
msgid "HTML"
-msgstr ""
+msgstr "HTML"
#: Merge.rc:2835
#, c-format
msgid "INI"
-msgstr ""
+msgstr "INI"
#: Merge.rc:2836
#, c-format
msgid "InnoSetup"
-msgstr ""
+msgstr "InnoSetup"
#: Merge.rc:2837
#, c-format
msgid "InstallShield"
-msgstr ""
+msgstr "InstallShield"
#: Merge.rc:2838
#, c-format
msgid "Java"
-msgstr ""
+msgstr "Java"
#: Merge.rc:2839
#, c-format
msgid "AutoLISP"
-msgstr ""
+msgstr "AutoLISP"
#: Merge.rc:2840
#, c-format
msgid "NSIS"
-msgstr ""
+msgstr "NSIS"
#: Merge.rc:2841
#, c-format
msgid "Pascal"
-msgstr ""
+msgstr "Pascal"
#: Merge.rc:2842
#, c-format
msgid "Perl"
-msgstr ""
+msgstr "Perl"
#: Merge.rc:2843
#, c-format
msgid "PHP"
-msgstr ""
+msgstr "PHP"
#: Merge.rc:2844
#, c-format
msgid "Portable Object"
-msgstr ""
+msgstr "\xCF\xF0\xE5\xED\xEE\xF1\xE8\xEC \xEE\xE1\xE5\xEA\xF2"
#: Merge.rc:2845
#, c-format
msgid "PowerShell"
-msgstr ""
+msgstr "PowerShell"
#: Merge.rc:2846
#, c-format
msgid "Python"
-msgstr ""
+msgstr "Python"
#: Merge.rc:2847
#, c-format
msgid "REXX"
-msgstr ""
+msgstr "REXX"
#: Merge.rc:2848
#, c-format
@@ -5998,47 +6130,47 @@
#: Merge.rc:2849
#, c-format
msgid "Ruby"
-msgstr ""
+msgstr "Ruby"
#: Merge.rc:2850
#, c-format
msgid "SGML"
-msgstr ""
+msgstr "SGML"
#: Merge.rc:2851
#, c-format
msgid "Shell"
-msgstr ""
+msgstr "Shell"
#: Merge.rc:2852
#, c-format
msgid "SIOD"
-msgstr ""
+msgstr "SIOD"
#: Merge.rc:2853
#, c-format
msgid "SQL"
-msgstr ""
+msgstr "SQL"
#: Merge.rc:2854
#, c-format
msgid "TCL"
-msgstr ""
+msgstr "TCL"
#: Merge.rc:2855
#, c-format
msgid "TEX"
-msgstr ""
+msgstr "TEX"
#: Merge.rc:2856
#, c-format
msgid "Verilog"
-msgstr ""
+msgstr "Verilog"
#: Merge.rc:2857
#, c-format
msgid "XML"
-msgstr ""
+msgstr "XML"
#: Merge.rc:2862
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-08 16:11:26
|
Revision: 7300
http://winmerge.svn.sourceforge.net/winmerge/?rev=7300&view=rev
Author: gerundt
Date: 2010-10-08 16:11:19 +0000 (Fri, 08 Oct 2010)
Log Message:
-----------
PATCH: [ 3082392 ] Updated Bulgarian Language
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Translations/WinMerge/Bulgarian.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-10-05 14:04:40 UTC (rev 7299)
+++ trunk/Docs/Users/ChangeLog.txt 2010-10-08 16:11:19 UTC (rev 7300)
@@ -7,6 +7,8 @@
Update version number in trunk
Installer: Remove Uninstall shortcut from start menu folder (#3076909)
Installer: Don't install quick launch icon for Windows 7 (#3079966)
+ Translation updates:
+ - Bulgarian (#3082392)
WinMerge 2.13.14 - 2010-09-15 (r7263)
Update release compiler and runtimes to VS2008
Modified: trunk/Translations/WinMerge/Bulgarian.po
===================================================================
--- trunk/Translations/WinMerge/Bulgarian.po 2010-10-05 14:04:40 UTC (rev 7299)
+++ trunk/Translations/WinMerge/Bulgarian.po 2010-10-08 16:11:19 UTC (rev 7300)
@@ -13,7 +13,7 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2008-05-04 21:51+0100\n"
+"PO-Revision-Date: 2010-10-06 22:09+0200\n"
"Last-Translator: tigertron <ivg_18 at yahoo.com>\n"
"Language-Team: Bulgarian <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -286,7 +286,7 @@
#: Merge.rc:457
#, c-format
msgid "&List..."
-msgstr ""
+msgstr "&\xD1\xEF\xE8\xF1\xFA\xEA..."
#: Merge.rc:152
#, c-format
@@ -514,17 +514,17 @@
#: Merge.rc:227
#, c-format
msgid "Tree &Mode"
-msgstr ""
+msgstr "\xD0\xE5\xE6\xE8\xEC &\xC4\xFA\xF0\xE2\xEE"
#: Merge.rc:228
#, c-format
msgid "E&xpand All Subfolders"
-msgstr ""
+msgstr "&\xD0\xE0\xE7\xE3\xFA\xF0\xED\xE8 \xE2\xF1\xE8\xF7\xEA\xE8 \xEF\xEE\xE4\xEF\xE0\xEF\xEA\xE8"
#: Merge.rc:229
#, c-format
msgid "&Collapse All Subfolders"
-msgstr ""
+msgstr "&\xD1\xFA\xE1\xE5\xF0\xE8 \xE2\xF1\xE8\xF7\xEA\xE8 \xEF\xEE\xE4\xEF\xE0\xEF\xEA\xE8"
#: Merge.rc:242
#, c-format
@@ -662,17 +662,17 @@
#: Merge.rc:345
#, c-format
msgid "&Windows (CRLF)"
-msgstr ""
+msgstr "&Windows (CRLF)"
#: Merge.rc:346
#, c-format
msgid "&Unix (LF)"
-msgstr ""
+msgstr "&Unix (LF)"
#: Merge.rc:347
#, c-format
msgid "&Mac (CR)"
-msgstr ""
+msgstr "&Mac (CR)"
#: Merge.rc:350
#, c-format
@@ -1078,7 +1078,7 @@
#: Merge.rc:674
#, c-format
msgid "(Private Build)"
-msgstr ""
+msgstr "(\xC2\xFA\xF2\xF0\xE5\xF8\xED\xE0 \xE2\xE5\xF0\xF1\xE8\xFF)"
#: Merge.rc:675
#, c-format
@@ -1209,7 +1209,7 @@
#: Merge.rc:721
#, c-format
msgid "Visual SourceSafe"
-msgstr ""
+msgstr "\xC2\xE8\xE7\xF3\xE0\xEB\xE5\xED SourceSafe"
#: Merge.rc:726
#, c-format
@@ -1314,7 +1314,7 @@
#: Merge.rc:780
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr ""
+msgstr "\xCF\xEE\xEA\xE0\xE6\xE8 \xEF\xF0\xEE\xE7\xEE\xF0\xE5\xF6\xE0 \"\xC8\xE7\xE1\xE5\xF0\xE8 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xE8\xEB\xE8 \xEF\xE0\xEF\xEA\xE8\" \xEF\xF0\xE8 \xF1\xF2\xE0\xF0\xF2\xE8\xF0\xE0\xED\xE5"
#: Merge.rc:782
#, c-format
@@ -1457,7 +1457,7 @@
#: Merge.rc:2202
#, c-format
msgid "Rational ClearCase"
-msgstr ""
+msgstr "\xD0\xE0\xF6\xE8\xEE\xED\xE0\xEB\xE5\xED ClearCase"
#: Merge.rc:875
#, c-format
@@ -1854,7 +1854,7 @@
#: Merge.rc:1168
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr ""
+msgstr "&\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xE9 \xE2\xF0\xFA\xF9\xE0\xED\xE8\xF2\xE5 \xF0\xE0\xE7\xEB\xE8\xEA\xE8 \xE7\xE0 \xF4\xEE\xF0\xEC\xE0\xF2\xE0 (Windows/Unix/Mac)"
#: Merge.rc:1170
#, c-format
@@ -2026,8 +2026,12 @@
#: Merge.rc:1265
#, c-format
-msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
+msgid ""
+"Detect codepage info for these files: .html, .rc, .xml \n"
+"need to restart session"
msgstr ""
+"\xCE\xF2\xEA\xF0\xE8\xE9 \xE8\xED\xF4\xEE\xF0\xEC\xE0\xF6\xE8\xFF \xE7\xE0 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0\xF2\xE0 \xED\xE0 \xF1\xEB\xE5\xE4\xED\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xEE\xE2\xE5: .html, .rc, .xml \n"
+"\xED\xE5\xEE\xE1\xF5\xEE\xE4\xE8\xEC\xEE \xE5 \xF0\xE5\xF1\xF2\xE0\xF0\xF2\xE8\xF0\xE0\xED\xE5 \xED\xE0 \xF1\xE5\xF1\xE8\xFF\xF2\xE0"
#: Merge.rc:1268
#, c-format
@@ -2042,7 +2046,7 @@
#: Merge.rc:1272
#, c-format
msgid "Custom codepage:"
-msgstr ""
+msgstr "\xC7\xE0\xE4\xE0\xE9 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0:"
#: Merge.rc:1280
#, c-format
@@ -2105,7 +2109,7 @@
#: Merge.rc:1300
#, c-format
msgid "Merge7z000U.dll"
-msgstr ""
+msgstr "Merge7z000U.dll"
#: Merge.rc:1303
#, c-format
@@ -2140,8 +2144,12 @@
#: Merge.rc:1314
#, c-format
-msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
-msgstr "\xCD\xE5 \xEF\xEE\xEA\xE0\xE7\xE2\xE0\xE9 \xEF\xE0\xEA \xF2\xEE\xE2\xE0 \xF1\xFA\xEE\xE1\xF9\xE5\xED\xE8\xE5.\n(\xC2\xE8\xED\xE0\xE3\xE8 \xEC\xEE\xE6\xE5\xF2\xE5 \xE4\xE0 \xE3\xEE \xE8\xE7\xE2\xE8\xEA\xE0\xF2\xE5 \xEE\xF2 \xEC\xE5\xED\xFE \xCF\xEE\xEC\xEE\xF9.)"
+msgid ""
+"Don't display this &message again.\n"
+"(You can always recall this message from the Help menu.)"
+msgstr ""
+"\xCD\xE5 \xEF\xEE\xEA\xE0\xE7\xE2\xE0\xE9 \xEF\xE0\xEA \xF2\xEE\xE2\xE0 \xF1\xFA\xEE\xE1\xF9\xE5\xED\xE8\xE5.\n"
+"(\xC2\xE8\xED\xE0\xE3\xE8 \xEC\xEE\xE6\xE5\xF2\xE5 \xE4\xE0 \xE3\xEE \xE8\xE7\xE2\xE8\xEA\xE0\xF2\xE5 \xEE\xF2 \xEC\xE5\xED\xFE \xCF\xEE\xEC\xEE\xF9.)"
#: Merge.rc:1318
#, c-format
@@ -2581,23 +2589,23 @@
#: Merge.rc:1651
#, c-format
msgid "Plugins"
-msgstr ""
+msgstr "\xC4\xEE\xE1\xE0\xE2\xEA\xE8"
#: Merge.rc:1654
#, c-format
msgid "&Enable plugins"
-msgstr ""
+msgstr "&\xC2\xEA\xEB\xFE\xF7\xE8 \xE4\xEE\xE1\xE0\xE2\xEA\xE8\xF2\xE5"
#: Merge.rc:1665
#: Merge.rc:1964
#, c-format
msgid "Shell Integration"
-msgstr ""
+msgstr "\xC8\xED\xF2\xE5\xE3\xF0\xE8\xF0\xE0\xED\xE5 \xE2 \xF8\xE5\xEB-\xE0"
#: Merge.rc:1668
#, c-format
msgid "Explorer"
-msgstr ""
+msgstr "Explorer"
#: Merge.rc:1669
#, c-format
@@ -2612,17 +2620,17 @@
#: Merge.rc:1673
#, c-format
msgid "&Add to context menu"
-msgstr ""
+msgstr "&\xC4\xEE\xE1\xE0\xE2\xE8 \xE2 \xEA\xEE\xED\xF2\xE5\xEA\xF1\xF2\xED\xEE\xF2\xEE \xEC\xE5\xED\xFE"
#: Merge.rc:1675
#, c-format
msgid "Folder compare"
-msgstr ""
+msgstr "\xD1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xED\xE0 \xEF\xE0\xEF\xEA\xE8"
#: Merge.rc:1676
#, c-format
msgid "Add &Shell menu to context menu"
-msgstr ""
+msgstr "\xC4\xEE\xE1\xE0\xE2\xE8 \xF0\xE5\xE4 \xE2 \xEA\xEE\xED\xF2\xE5\xEA\xF1\xF2\xED\xEE\xF2\xEE \xEC\xE5\xED\xFE"
#: Merge.rc:1683
#: Merge.rc:1967
@@ -2676,32 +2684,32 @@
#: Merge.rc:1757
#, c-format
msgid "EXT"
-msgstr ""
+msgstr "EXT"
#: Merge.rc:1758
#, c-format
msgid "CAP"
-msgstr ""
+msgstr "CAP"
#: Merge.rc:1759
#, c-format
msgid "NUM"
-msgstr ""
+msgstr "NUM"
#: Merge.rc:1760
#, c-format
msgid "SCRL"
-msgstr ""
+msgstr "SCRL"
#: Merge.rc:1761
#, c-format
msgid "OVR"
-msgstr ""
+msgstr "OVR"
#: Merge.rc:1762
#, c-format
msgid "REC"
-msgstr ""
+msgstr "REC"
#: Merge.rc:1768
#, c-format
@@ -2792,17 +2800,17 @@
#: Merge.rc:1782
#, c-format
msgid "Toggle tree mode"
-msgstr ""
+msgstr "\xCF\xF0\xE5\xE2\xEA\xEB\xFE\xF7\xE8 \xED\xE0 \xE4\xFA\xF0\xE2\xEE\xE2\xE8\xE4\xE5\xED \xF0\xE5\xE6\xE8\xEC"
#: Merge.rc:1783
#, c-format
msgid "Expand all subfolders"
-msgstr ""
+msgstr "\xD0\xE0\xE7\xE3\xFA\xF0\xED\xE8 \xE2\xF1\xE8\xF7\xEA\xE8 \xEF\xEE\xE4\xEF\xE0\xEF\xEA\xE8"
#: Merge.rc:1784
#, c-format
msgid "Collapse all subfolders"
-msgstr ""
+msgstr "\xD1\xFA\xE1\xE5\xF0\xE8 \xE2\xF1\xE8\xF7\xEA\xE8 \xEF\xEE\xE4\xEF\xE0\xEF\xEA\xE8"
#: Merge.rc:1790
#, c-format
@@ -2913,22 +2921,22 @@
"\xCF\xEE\xE4\xF0\xE5\xE4\xE8 \xCA\xE0\xF1\xEA\xE0\xE4\xED\xEE"
#: Merge.rc:1836
-#, fuzzy, c-format
+#, c-format
msgid ""
"Arrange windows as non-overlapping tiles horizontally\n"
"Tile Windows Horizontally"
msgstr ""
-"\xCF\xEE\xE4\xF0\xE5\xE6\xE4\xE0 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xE1\xE5\xE7 \xE4\xE0 \xF1\xE5 \xEF\xEE\xEA\xF0\xE8\xE2\xE0\xF2\n"
-"\xCF\xEE\xE4\xF0\xE5\xE4\xE8 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5"
+"\xCF\xEE\xE4\xF0\xE5\xE6\xE4\xE0 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xF5\xEE\xF0\xE8\xE7\xEE\xED\xF2\xE0\xEB\xED\xEE \xE1\xE5\xE7 \xE4\xE0 \xF1\xE5 \xEF\xEE\xEA\xF0\xE8\xE2\xE0\xF2\n"
+"\xCF\xEE\xE4\xF0\xE5\xE4\xE8 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xF5\xEE\xF0\xE8\xE7\xEE\xED\xF2\xE0\xEB\xED\xEE"
#: Merge.rc:1837
-#, fuzzy, c-format
+#, c-format
msgid ""
"Arrange windows as non-overlapping tiles vertically\n"
"Tile Windows Vertically"
msgstr ""
-"\xCF\xEE\xE4\xF0\xE5\xE6\xE4\xE0 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xE1\xE5\xE7 \xE4\xE0 \xF1\xE5 \xEF\xEE\xEA\xF0\xE8\xE2\xE0\xF2\n"
-"\xCF\xEE\xE4\xF0\xE5\xE4\xE8 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5"
+"\xCF\xEE\xE4\xF0\xE5\xE6\xE4\xE0 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xE2\xE5\xF0\xF2\xE8\xEA\xE0\xEB\xED\xEE \xE1\xE5\xE7 \xE4\xE0 \xF1\xE5 \xEF\xEE\xEA\xF0\xE8\xE2\xE0\xF2\n"
+"\xCF\xEE\xE4\xF0\xE5\xE4\xE8 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xE2\xE5\xF0\xF2\xE8\xEA\xE0\xEB\xED\xEE"
#: Merge.rc:1843
#, c-format
@@ -3040,8 +3048,12 @@
#: Merge.rc:1860
#, c-format
-msgid "Automatically resize panes\nLock Panes"
-msgstr "\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xF7\xED\xEE \xEE\xF0\xE0\xE7\xEC\xE5\xF0\xE8 \xEF\xE0\xED\xE5\xEB\xE8\xF2\xE5\n\xC7\xE0\xEA\xEB\xFE\xF7\xE8 \xEF\xE0\xED\xE5\xEB\xE8\xF2\xE5"
+msgid ""
+"Automatically resize panes\n"
+"Lock Panes"
+msgstr ""
+"\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xF7\xED\xEE \xEE\xF0\xE0\xE7\xEC\xE5\xF0\xE8 \xEF\xE0\xED\xE5\xEB\xE8\xF2\xE5\n"
+"\xC7\xE0\xEA\xEB\xFE\xF7\xE8 \xEF\xE0\xED\xE5\xEB\xE8\xF2\xE5"
#: Merge.rc:1866
#, c-format
@@ -3104,13 +3116,41 @@
#: Merge.rc:1892
#, c-format
-msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
+msgid ""
+"\n"
+"FileCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FileCompare\n"
+"WinMerge File Compare"
msgstr ""
+"\n"
+"FileCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FileCompare\n"
+"WinMerge \xF1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xED\xE0 \xF4\xE0\xE9\xEB\xEE\xE2\xE5"
#: Merge.rc:1893
#, c-format
-msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
+msgid ""
+"\n"
+"FolderCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FolderCompare\n"
+"WinMerge Folder Compare"
msgstr ""
+"\n"
+"FolderCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FolderCompare\n"
+"WinMerge \xF1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5 \xED\xE0 \xEF\xE0\xEF\xEA\xE8"
#: Merge.rc:1900
#, c-format
@@ -3130,8 +3170,12 @@
#: Merge.rc:1920
#, c-format
-msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
-msgstr "\xD0\xE0\xE7\xF0\xE0\xE1\xEE\xF2\xF7\xE8\xF6\xE8:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
+msgid ""
+"Developers:\n"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
+msgstr ""
+"\xD0\xE0\xE7\xF0\xE0\xE1\xEE\xF2\xF7\xE8\xF6\xE8:\n"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
#: Merge.rc:1921
#, c-format
@@ -3262,7 +3306,7 @@
#: Merge.rc:1986
#, c-format
msgid "X64"
-msgstr ""
+msgstr "X64"
#: Merge.rc:1992
#, c-format
@@ -3349,22 +3393,22 @@
#: Merge.rc:2024
#, c-format
msgid "UTF-8"
-msgstr ""
+msgstr "UTF-8"
#: Merge.rc:2025
#, c-format
msgid "UTF-8 (B)"
-msgstr ""
+msgstr "UTF-8 (B)"
#: Merge.rc:2026
#, c-format
msgid "UCS-2 LE"
-msgstr ""
+msgstr "UCS-2 LE"
#: Merge.rc:2027
#, c-format
msgid "UCS-2 BE"
-msgstr ""
+msgstr "UCS-2 BE"
#: Merge.rc:2033
#, c-format
@@ -3410,7 +3454,7 @@
#: Merge.rc:2046
#, c-format
msgid "[F] "
-msgstr ""
+msgstr "[F] "
#: Merge.rc:2047
#: Merge.rc:2571
@@ -3506,13 +3550,19 @@
#: Merge.rc:2074
#, c-format
-msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
+msgid ""
+"Filters were updated. Do you want to refresh all open folder compares?\n"
+"\n"
+"If you do not want to refresh all compares now you can select No and refresh compares later."
msgstr ""
+"\xD4\xE8\xEB\xF2\xF0\xE8\xF2\xE5 \xE1\xFF\xF5\xE0 \xEE\xE1\xED\xEE\xE2\xE5\xED\xE8. \xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEE\xEF\xF0\xE5\xF1\xED\xE8\xF2\xE5 \xE2\xF1\xE8\xF7\xEA\xE8 \xEE\xF2\xE2\xEE\xF0\xE5\xED\xE8 \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xFF \xED\xE0 \xEF\xE0\xEF\xEA\xE8?\n"
+"\n"
+"\xC0\xEA\xEE \xED\xE5 \xE8\xF1\xEA\xE0\xF2\xE5 \xE4\xE0 \xEE\xEF\xF0\xE5\xF1\xED\xE8\xF2\xE5 \xE2\xF1\xE8\xF7\xEA\xE8 \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xFF \xF1\xE5\xE3\xE0, \xEC\xEE\xE6\xE5\xF2\xE5 \xE4\xE0 \xED\xE0\xF2\xE8\xF1\xED\xE5\xF2\xE5 \xCD\xE5 \xE8 \xE4\xE0 \xE3\xE8 \xEE\xEF\xF0\xE5\xF1\xED\xE8\xF2\xE5 \xEF\xEE-\xEA\xFA\xF1\xED\xEE."
#: Merge.rc:2081
#, c-format
msgid "&Path to SS.EXE:"
-msgstr ""
+msgstr "&\xCF\xFA\xF2 \xE4\xEE SS.EXE:"
#: Merge.rc:2087
#, c-format
@@ -3597,12 +3647,12 @@
#: Merge.rc:2108
#, c-format
msgid "Undoing the last operation..."
-msgstr ""
+msgstr "\xCE\xF2\xEC\xE5\xED\xFF\xED\xE5 \xED\xE0 \xEF\xEE\xF1\xEB\xE5\xE4\xED\xEE\xF2\xEE \xE4\xE5\xE9\xF1\xF2\xE2\xE8\xE5..."
#: Merge.rc:2109
#, c-format
msgid "Redoing the previous operation..."
-msgstr ""
+msgstr "\xCF\xEE\xE2\xF2\xE0\xF0\xFF\xED\xE5 \xED\xE0 \xEF\xF0\xE5\xE4\xE8\xF8\xED\xEE\xF2\xEE \xE4\xE5\xE9\xF1\xF2\xE2\xE8\xE5..."
#: Merge.rc:2115
#, c-format
@@ -3725,8 +3775,14 @@
#: Merge.rc:2152
#, c-format
-msgid "The file\n%1\nis not a conflict file."
-msgstr "\xD4\xE0\xE9\xEB\xFA\xF2\n%1\n\xED\xE5 \xE5 \xEA\xEE\xED\xF4\xEB\xE8\xEA\xF2\xE5\xED."
+msgid ""
+"The file\n"
+"%1\n"
+"is not a conflict file."
+msgstr ""
+"\xD4\xE0\xE9\xEB\xFA\xF2\n"
+"%1\n"
+"\xED\xE5 \xE5 \xEA\xEE\xED\xF4\xEB\xE8\xEA\xF2\xE5\xED."
#: Merge.rc:2158
#, c-format
@@ -3839,8 +3895,18 @@
#: Merge.rc:2170
#, c-format
-msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
+msgid ""
+"Another application has updated file\n"
+"%1\n"
+"since WinMerge scanned it last time.\n"
+"\n"
+"Do you want to reload the file?"
msgstr ""
+"\xC4\xF0\xF3\xE3\xEE \xEF\xF0\xE8\xEB\xEE\xE6\xE5\xED\xE8\xE5 \xE5 \xEE\xE1\xED\xEE\xE2\xE8\xEB\xEE \xF4\xE0\xE9\xEB\xE0\n"
+"%1\n"
+"\xF1\xEB\xE5\xE4 \xEF\xEE\xF1\xEB\xE5\xE4\xED\xEE\xF2\xEE \xF1\xEA\xE0\xED\xE8\xF0\xE0\xED\xE5 \xEE\xF2 WinMerge.\n"
+"\n"
+"\xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEE\xF2\xE2\xEE\xF0\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xE0 \xED\xE0\xED\xEE\xE2\xEE?"
#: Merge.rc:2171
#, c-format
@@ -3854,8 +3920,14 @@
#: Merge.rc:2173
#, c-format
-msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
+msgid ""
+"The file\n"
+"%1\n"
+"has disappeared. Please save a copy of the file to continue."
msgstr ""
+"\xD4\xE0\xE9\xEB\xFA\xF2\n"
+"%1\n"
+"\xE5 \xE8\xE7\xF7\xE5\xE7\xED\xE0\xEB. \xCC\xEE\xEB\xFF, \xE7\xE0\xEF\xE8\xF8\xE5\xF2\xE5 \xED\xE5\xE3\xEE\xE2\xEE \xEA\xEE\xEF\xE8\xE5, \xE7\xE0 \xE4\xE0 \xEF\xF0\xEE\xE4\xFA\xEB\xE6\xE8\xF2\xE5."
#: Merge.rc:2179
#, c-format
@@ -4128,17 +4200,17 @@
#: Merge.rc:2256
#, c-format
msgid "Are you sure you want to move:"
-msgstr ""
+msgstr "\xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEF\xF0\xE5\xEC\xE5\xF1\xF2\xE8\xF2\xE5:"
#: Merge.rc:2257
#, c-format
msgid "Are you sure you want to move %d items:"
-msgstr ""
+msgstr "\xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEF\xF0\xE5\xEC\xE5\xF1\xF2\xE8\xF2\xE5 %d :"
#: Merge.rc:2259
#, c-format
msgid "Confirm Move"
-msgstr ""
+msgstr "\xCF\xEE\xF2\xE2\xFA\xF0\xE4\xE5\xF2\xE5 \xEF\xF0\xE5\xEC\xE5\xF1\xF2\xE2\xE0\xED\xE5"
#: Merge.rc:2265
#, c-format
@@ -4203,12 +4275,12 @@
#: Merge.rc:2282
#, c-format
msgid "Left Shell menu"
-msgstr ""
+msgstr "\xCB\xFF\xE2\xEE \xEC\xE5\xED\xFE"
#: Merge.rc:2283
#, c-format
msgid "Right Shell menu"
-msgstr ""
+msgstr "\xC4\xFF\xF1\xED\xEE \xEC\xE5\xED\xFE"
#: Merge.rc:2289
#, c-format
@@ -4409,7 +4481,7 @@
#: Merge.rc:2353
#, c-format
msgid "Folders are different"
-msgstr ""
+msgstr "\xCF\xE0\xEF\xEA\xE8\xF2\xE5 \xF1\xE0 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8"
#: Merge.rc:2354
#, c-format
@@ -4429,12 +4501,12 @@
#: Merge.rc:2358
#, c-format
msgid "Text files are identical"
-msgstr ""
+msgstr "\xD2\xE5\xEA\xF1\xF2\xEE\xE2\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xF1\xE0 \xE5\xE4\xED\xE0\xEA\xE2\xE8"
#: Merge.rc:2363
#, c-format
msgid "Text files are different"
-msgstr ""
+msgstr "\xD2\xE5\xEA\xF1\xF2\xEE\xE2\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xF1\xE0 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8"
#: Merge.rc:2369
#, c-format
@@ -4657,8 +4729,14 @@
#: Merge.rc:2436
#, c-format
-msgid "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
-msgstr "\xD1\xE8\xEC\xE2\xEE\xEB\xE8\xF2\xE5 EOL \xF1\xE0 \xEE\xF2 \xF0\xE0\xE7\xEB\xE8\xF7\xE5\xED \xF2\xE8\xEF (Windows/Unix/Mac) \xE2\xFA\xE2 \xF4\xE0\xE9\xEB\xE0 '%1'.\n \xD1 \xF2\xE5\xEA\xF3\xF9\xE8\xF2\xE5 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8 \xF2\xE5 \xF9\xE5 \xE1\xFA\xE4\xE0\xF2 \xF3\xE5\xE4\xED\xE0\xEA\xE2\xE5\xED\xE8 \xF1 \xEE\xF1\xED\xEE\xE2\xED\xE8\xFF\xF2 \xF2\xE8\xEF.\n \xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEF\xF0\xEE\xEC\xE5\xED\xE8\xF2\xE5 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8\xF2\xE5, \xE7\xE0 \xE4\xE0 \xF1\xE5 \xEF\xF0\xE5\xE4\xEF\xE0\xE7\xE8\xF2\xE5 \xEE\xF2 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8 EOL ?"
+msgid ""
+"The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
+" With the current options, they will be unified to the main type.\n"
+" Do you want to change the options and preserve the different EOL ?"
+msgstr ""
+"\xD1\xE8\xEC\xE2\xEE\xEB\xE8\xF2\xE5 EOL \xF1\xE0 \xEE\xF2 \xF0\xE0\xE7\xEB\xE8\xF7\xE5\xED \xF2\xE8\xEF (Windows/Unix/Mac) \xE2\xFA\xE2 \xF4\xE0\xE9\xEB\xE0 '%1'.\n"
+" \xD1 \xF2\xE5\xEA\xF3\xF9\xE8\xF2\xE5 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8 \xF2\xE5 \xF9\xE5 \xE1\xFA\xE4\xE0\xF2 \xF3\xE5\xE4\xED\xE0\xEA\xE2\xE5\xED\xE8 \xF1 \xEE\xF1\xED\xEE\xE2\xED\xE8\xFF\xF2 \xF2\xE8\xEF.\n"
+" \xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEF\xF0\xEE\xEC\xE5\xED\xE8\xF2\xE5 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8\xF2\xE5, \xE7\xE0 \xE4\xE0 \xF1\xE5 \xEF\xF0\xE5\xE4\xEF\xE0\xE7\xE8\xF2\xE5 \xEE\xF2 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8 EOL ?"
#: Merge.rc:2437
#, c-format
@@ -4677,8 +4755,18 @@
#: Merge.rc:2440
#, c-format
-msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?"
-msgstr "\xCF\xE0\xEF\xEA\xE0\xF2\xE0 \xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0 \xF1\xE0\xEC\xEE \xE2 \xE4\xF0\xF3\xE3\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0 \xE8 \xED\xE5 \xEC\xEE\xE6\xE5 \xE4\xE0 \xF1\xE5 \xEE\xF2\xE2\xEE\xF0\xE8.\n\n\xC8\xF1\xEA\xE0\xF2 \xEB\xE8 \xE4\xE0 \xF1\xFA\xE7\xE4\xE0\xE4\xE5\xF2\xE5 \xF1\xFA\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xE0\xF9\xE8 \xEF\xE0\xEF\xEA\xE8:\n%1\n\xE2 \xE4\xF0\xF3\xE3\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0 \xE8 \xE4\xE0 \xE3\xE8 \xEE\xF2\xE2\xEE\xF0\xE8\xF2\xE5?"
+msgid ""
+"The folder exists only in other side and cannot be opened.\n"
+"\n"
+"Do you want to create a matching folder:\n"
+"%1\n"
+"to the other side and open these folders?"
+msgstr ""
+"\xCF\xE0\xEF\xEA\xE0\xF2\xE0 \xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0 \xF1\xE0\xEC\xEE \xE2 \xE4\xF0\xF3\xE3\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0 \xE8 \xED\xE5 \xEC\xEE\xE6\xE5 \xE4\xE0 \xF1\xE5 \xEE\xF2\xE2\xEE\xF0\xE8.\n"
+"\n"
+"\xC8\xF1\xEA\xE0\xF2 \xEB\xE8 \xE4\xE0 \xF1\xFA\xE7\xE4\xE0\xE4\xE5\xF2\xE5 \xF1\xFA\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xE0\xF9\xE8 \xEF\xE0\xEF\xEA\xE8:\n"
+"%1\n"
+"\xE2 \xE4\xF0\xF3\xE3\xE0\xF2\xE0 \xF1\xF2\xF0\xE0\xED\xE0 \xE8 \xE4\xE0 \xE3\xE8 \xEE\xF2\xE2\xEE\xF0\xE8\xF2\xE5?"
#: Merge.rc:2446
#, c-format
@@ -4995,17 +5083,17 @@
#: Merge.rc:2545
#, c-format
msgid "Win"
-msgstr ""
+msgstr "Win"
#: Merge.rc:2546
#, c-format
msgid "Mac"
-msgstr ""
+msgstr "Mac"
#: Merge.rc:2547
#, c-format
msgid "Unix"
-msgstr ""
+msgstr "Unix"
#: Merge.rc:2548
#, c-format
@@ -5015,17 +5103,17 @@
#: Merge.rc:2550
#, c-format
msgid "LF"
-msgstr ""
+msgstr "LF"
#: Merge.rc:2551
#, c-format
msgid "CR"
-msgstr ""
+msgstr "CR"
#: Merge.rc:2552
#, c-format
msgid "CRLF"
-msgstr ""
+msgstr "CRLF"
#: Merge.rc:2559
#, c-format
@@ -5060,22 +5148,22 @@
#: Merge.rc:2570
#, c-format
msgid "Type"
-msgstr ""
+msgstr "\xD2\xE8\xEF"
#: Merge.rc:2572
#, c-format
msgid "Unpacker"
-msgstr ""
+msgstr "\xD0\xE0\xE7\xE0\xF0\xF5\xE8\xE2\xE0\xF2\xEE\xF0"
#: Merge.rc:2573
#, c-format
msgid "Prediffer"
-msgstr ""
+msgstr "\xCF\xF0\xE5\xE4\xE8\xF8\xED\xE0 \xD0\xE0\xE7\xEB\xE8\xEA\xE0"
#: Merge.rc:2574
#, c-format
msgid "Editor script"
-msgstr ""
+msgstr "\xD1\xEA\xF0\xE8\xEF\xF2 \xED\xE0 \xF0\xE5\xE4\xE0\xEA\xF2\xEE\xF0\xE0"
#: Merge.rc:2581
#, c-format
@@ -5100,12 +5188,12 @@
#: Merge.rc:2585
#, c-format
msgid "Change left side file/folder read-only status"
-msgstr ""
+msgstr "\xCF\xF0\xEE\xEC\xE5\xED\xE8 \xF1\xF2\xE0\xF2\xF3\xF1\xE0 \xF1\xE0\xEC\xEE \xE7\xE0 \xF7\xE5\xF2\xE5\xED\xE5 \xED\xE0 \xF4\xE0\xE9\xEB\xE0/\xEF\xE0\xEF\xEA\xE0\xF2\xE0 \xEE\xF2 \xEB\xFF\xE2\xEE"
#: Merge.rc:2586
#, c-format
msgid "Change right side file/folder read-only status"
-msgstr ""
+msgstr "\xCF\xF0\xEE\xEC\xE5\xED\xE8 \xF1\xF2\xE0\xF2\xF3\xF1\xE0 \xF1\xE0\xEC\xEE \xE7\xE0 \xF7\xE5\xF2\xE5\xED\xE5 \xED\xE0 \xF4\xE0\xE9\xEB\xE0/\xEF\xE0\xEF\xEA\xE0\xF2\xE0 \xEE\xF2 \xE4\xFF\xF1\xED\xEE"
#: Merge.rc:2587
#, c-format
@@ -5301,13 +5389,21 @@
#: Merge.rc:2630
#, c-format
-msgid "Select the current user interface language\nLanguage"
-msgstr "\xC8\xE7\xE1\xEE\xF0 \xED\xE0 \xF2\xE5\xEA\xF3\xF9 \xEF\xEE\xF2\xF0\xE5\xE1\xE8\xF2\xE5\xEB\xF1\xEA\xE8 \xE8\xED\xF2\xE5\xF0\xF4\xE5\xE9\xF1\n\xC5\xE7\xE8\xEA"
+msgid ""
+"Select the current user interface language\n"
+"Language"
+msgstr ""
+"\xC8\xE7\xE1\xEE\xF0 \xED\xE0 \xF2\xE5\xEA\xF3\xF9 \xEF\xEE\xF2\xF0\xE5\xE1\xE8\xF2\xE5\xEB\xF1\xEA\xE8 \xE8\xED\xF2\xE5\xF0\xF4\xE5\xE9\xF1\n"
+"\xC5\xE7\xE8\xEA"
#: Merge.rc:2631
#, c-format
-msgid "Shows differences inside lines with different colors\nShow Line Difference"
-msgstr "\xCF\xEE\xEA\xE0\xE7\xE2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE8\xF2\xE5 \xE2 \xF0\xE5\xE4\xEE\xE2\xE5\xF2\xE5 \xF1 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8 \xF6\xE2\xE5\xF2\xEE\xE2\xE5\n\xCF\xEE\xEA\xE0\xE6\xE8 \xF0\xE0\xE7\xEB\xE8\xF7\xE8\xFF\xF2\xE0 \xE2 \xF0\xE5\xE4\xE0"
+msgid ""
+"Shows differences inside lines with different colors\n"
+"Show Line Difference"
+msgstr ""
+"\xCF\xEE\xEA\xE0\xE7\xE2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE8\xF2\xE5 \xE2 \xF0\xE5\xE4\xEE\xE2\xE5\xF2\xE5 \xF1 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8 \xF6\xE2\xE5\xF2\xEE\xE2\xE5\n"
+"\xCF\xEE\xEA\xE0\xE6\xE8 \xF0\xE0\xE7\xEB\xE8\xF7\xE8\xFF\xF2\xE0 \xE2 \xF0\xE5\xE4\xE0"
#: Merge.rc:2632
#, c-format
@@ -5358,28 +5454,48 @@
#: Merge.rc:2644
#, c-format
-msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
-msgstr "\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xEF\xF0\xE5\xE4\xE8\xF8\xED\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n\xCF\xF0\xE5\xE4\xE8\xF8\xED\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Up)"
+msgid ""
+"Scroll to the previous difference\n"
+"Previous Difference (Alt+Up)"
+msgstr ""
+"\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xEF\xF0\xE5\xE4\xE8\xF8\xED\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n"
+"\xCF\xF0\xE5\xE4\xE8\xF8\xED\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Up)"
#: Merge.rc:2645
#, c-format
-msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
-msgstr "\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xF1\xEB\xE5\xE4\xE2\xE0\xF9\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n\xD1\xEB\xE5\xE4\xE2\xE0\xF9\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Down)"
+msgid ""
+"Scroll to the next difference\n"
+"Next Difference (Alt+Down)"
+msgstr ""
+"\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xF1\xEB\xE5\xE4\xE2\xE0\xF9\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n"
+"\xD1\xEB\xE5\xE4\xE2\xE0\xF9\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Down)"
#: Merge.rc:2646
#, c-format
-msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
-msgstr "\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xEF\xFA\xF0\xE2\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n\xCF\xFA\xF0\xE2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Home)"
+msgid ""
+"Scroll to the first difference\n"
+"First Difference (Alt+Home)"
+msgstr ""
+"\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xEF\xFA\xF0\xE2\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n"
+"\xCF\xFA\xF0\xE2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Home)"
#: Merge.rc:2647
#, c-format
-msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
-msgstr "\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xF2\xE5\xEA\xF3\xF9\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n\xD2\xE5\xEA\xF3\xF9\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Enter)"
+msgid ""
+"Scroll to the current difference\n"
+"Current Difference (Alt+Enter)"
+msgstr ""
+"\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xF2\xE5\xEA\xF3\xF9\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n"
+"\xD2\xE5\xEA\xF3\xF9\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+Enter)"
#: Merge.rc:2648
#, c-format
-msgid "Scroll to the last difference\nLast Difference (Alt+End)"
-msgstr "\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xEF\xEE\xF1\xEB\xE5\xE4\xED\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n\xCF\xEE\xF1\xEB\xE5\xE4\xED\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+End)"
+msgid ""
+"Scroll to the last difference\n"
+"Last Difference (Alt+End)"
+msgstr ""
+"\xCF\xF0\xE5\xEC\xE5\xF1\xF2\xE8 \xE4\xEE \xEF\xEE\xF1\xEB\xE5\xE4\xED\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0\n"
+"\xCF\xEE\xF1\xEB\xE5\xE4\xED\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0 (Alt+End)"
#: Merge.rc:2649
#, c-format
@@ -5468,7 +5584,7 @@
#: Merge.rc:2671
#, c-format
msgid "Shows a list of available plugins"
-msgstr ""
+msgstr "\xCF\xEE\xEA\xE0\xE7\xE2\xE0 \xF1\xEF\xE8\xF1\xFA\xEA \xF1 \xED\xE0\xEB\xE8\xF7\xED\xE8\xF2\xE5 \xE4\xEE\xE1\xE0\xE2\xEA\xE8"
#: Merge.rc:2672
#, c-format
@@ -5507,8 +5623,12 @@
#: Merge.rc:2684
#, c-format
-msgid "Activates next visible file\nActivate next File"
-msgstr "\xC0\xEA\xF2\xE8\xE2\xE8\xF0\xE0 \xF1\xEB\xE5\xE4\xE2\xE0\xF9\xE8\xFF\xF2 \xE2\xE8\xE4\xE8\xEC \xF4\xE0\xE9\xEB\n\xC0\xEA\xF2\xE8\xE2\xE8\xF0\xE0\xE9 \xF1\xEB\xE5\xE4\xE2\xE0\xF9 \xF4\xE0\xE9\xEB"
+msgid ""
+"Activates next visible file\n"
+"Activate next File"
+msgstr ""
+"\xC0\xEA\xF2\xE8\xE2\xE8\xF0\xE0 \xF1\xEB\xE5\xE4\xE2\xE0\xF9\xE8\xFF\xF2 \xE2\xE8\xE4\xE8\xEC \xF4\xE0\xE9\xEB\n"
+"\xC0\xEA\xF2\xE8\xE2\xE8\xF0\xE0\xE9 \xF1\xEB\xE5\xE4\xE2\xE0\xF9 \xF4\xE0\xE9\xEB"
#: Merge.rc:2685
#, c-format
@@ -5517,8 +5637,12 @@
#: Merge.rc:2691
#, c-format
-msgid "Opens the WinMerge Help\nWinMerge Help"
-msgstr "\xCE\xF2\xE2\xE0\xF0\xFF \xEF\xEE\xEC\xEE\xF9\xF2\xE0 \xED\xE0 WinMerge\nWinMerge \xEF\xEE\xEC\xEE\xF9"
+msgid ""
+"Opens the WinMerge Help\n"
+"WinMerge Help"
+msgstr ""
+"\xCE\xF2\xE2\xE0\xF0\xFF \xEF\xEE\xEC\xEE\xF9\xF2\xE0 \xED\xE0 WinMerge\n"
+"WinMerge \xEF\xEE\xEC\xEE\xF9"
#: Merge.rc:2692
#, c-format
@@ -5537,13 +5661,21 @@
#: Merge.rc:2695
#, c-format
-msgid "Opens the release notes document\nRelease Notes"
-msgstr "\xCE\xF2\xE2\xE0\xF0\xFF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0 \xF1 \xE1\xE5\xEB\xE5\xE6\xEA\xE8 \xE7\xE0 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE0\xF2\xE0\n\xC1\xE5\xEB\xE5\xE6\xEA\xE8"
+msgid ""
+"Opens the release notes document\n"
+"Release Notes"
+msgstr ""
+"\xCE\xF2\xE2\xE0\xF0\xFF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0 \xF1 \xE1\xE5\xEB\xE5\xE6\xEA\xE8 \xE7\xE0 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE0\xF2\xE0\n"
+"\xC1\xE5\xEB\xE5\xE6\xEA\xE8"
#: Merge.rc:2696
#, c-format
-msgid "Opens the translations website\nTranslations"
-msgstr "\xCE\xF2\xE2\xE0\xF0\xFF \xF1\xF2\xF0\xE0\xED\xE8\xF6\xE0\xF2\xE0 \xF1 \xEF\xF0\xE5\xE2\xEE\xE4\xE8\n\xCF\xF0\xE5\xE2\xEE\xE4\xE8"
+msgid ""
+"Opens the translations website\n"
+"Translations"
+msgstr ""
+"\xCE\xF2\xE2\xE0\xF0\xFF \xF1\xF2\xF0\xE0\xED\xE8\xF6\xE0\xF2\xE0 \xF1 \xEF\xF0\xE5\xE2\xEE\xE4\xE8\n"
+"\xCF\xF0\xE5\xE2\xEE\xE4\xE8"
#: Merge.rc:2702
#, c-format
@@ -5638,117 +5770,117 @@
#: Merge.rc:2741
#, c-format
msgid "No Highlighting"
-msgstr ""
+msgstr "\xC1\xE5\xE7 \xEE\xF6\xE2\xE5\xF2\xFF\xE2\xE0\xED\xE5"
#: Merge.rc:2742
#, c-format
msgid "ASP"
-msgstr ""
+msgstr "ASP"
#: Merge.rc:2743
#, c-format
msgid "Basic"
-msgstr "\xCE\xF1\xED\xEE\xE2\xE5\xED"
+msgstr "Basic"
#: Merge.rc:2744
#, c-format
msgid "Batch"
-msgstr ""
+msgstr "Batch"
#: Merge.rc:2745
#, c-format
msgid "C/C++"
-msgstr ""
+msgstr "C/C++"
#: Merge.rc:2746
#, c-format
msgid "C#"
-msgstr ""
+msgstr "C#"
#: Merge.rc:2747
#, c-format
msgid "CSS"
-msgstr ""
+msgstr "CSS"
#: Merge.rc:2748
#, c-format
msgid "DCL"
-msgstr ""
+msgstr "DCL"
#: Merge.rc:2749
#, c-format
msgid "Fortran"
-msgstr ""
+msgstr "Fortran"
#: Merge.rc:2750
#, c-format
msgid "HTML"
-msgstr ""
+msgstr "HTML"
#: Merge.rc:2751
#, c-format
msgid "INI"
-msgstr ""
+msgstr "INI"
#: Merge.rc:2752
#, c-format
msgid "InnoSetup"
-msgstr ""
+msgstr "InnoSetup"
#: Merge.rc:2753
#, c-format
msgid "InstallShield"
-msgstr ""
+msgstr "InstallShield"
#: Merge.rc:2754
#, c-format
msgid "Java"
-msgstr ""
+msgstr "Java"
#: Merge.rc:2755
#, c-format
msgid "AutoLISP"
-msgstr ""
+msgstr "AutoLISP"
#: Merge.rc:2756
#, c-format
msgid "NSIS"
-msgstr ""
+msgstr "NSIS"
#: Merge.rc:2757
#, c-format
msgid "Pascal"
-msgstr ""
+msgstr "Pascal"
#: Merge.rc:2758
#, c-format
msgid "Perl"
-msgstr ""
+msgstr "Perl"
#: Merge.rc:2759
#, c-format
msgid "PHP"
-msgstr ""
+msgstr "PHP"
#: Merge.rc:2760
#, c-format
msgid "Portable Object"
-msgstr ""
+msgstr "\xCF\xF0\xE5\xED\xEE\xF1\xE8\xEC \xEE\xE1\xE5\xEA\xF2"
#: Merge.rc:2761
#, c-format
msgid "PowerShell"
-msgstr ""
+msgstr "PowerShell"
#: Merge.rc:2762
#, c-format
msgid "Python"
-msgstr ""
+msgstr "Python"
#: Merge.rc:2763
#, c-format
msgid "REXX"
-msgstr ""
+msgstr "REXX"
#: Merge.rc:2764
#, c-format
@@ -5758,47 +5890,47 @@
#: Merge.rc:2765
#, c-format
msgid "Ruby"
-msgstr ""
+msgstr "Ruby"
#: Merge.rc:2766
#, c-format
msgid "SGML"
-msgstr ""
+msgstr "SGML"
#: Merge.rc:2767
#, c-format
msgid "Shell"
-msgstr ""
+msgstr "Shell"
#: Merge.rc:2768
#, c-format
msgid "SIOD"
-msgstr ""
+msgstr "SIOD"
#: Merge.rc:2769
#, c-format
msgid "SQL"
-msgstr ""
+msgstr "SQL"
#: Merge.rc:2770
#, c-format
msgid "TCL"
-msgstr ""
+msgstr "TCL"
#: Merge.rc:2771
#, c-format
msgid "TEX"
-msgstr ""
+msgstr "TEX"
#: Merge.rc:2772
#, c-format
msgid "Verilog"
-msgstr ""
+msgstr "Verilog"
#: Merge.rc:2773
#, c-format
msgid "XML"
-msgstr ""
+msgstr "XML"
#: Merge.rc:2778
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-10-05 14:04:47
|
Revision: 7299
http://winmerge.svn.sourceforge.net/winmerge/?rev=7299&view=rev
Author: denisbradford
Date: 2010-10-05 14:04:40 +0000 (Tue, 05 Oct 2010)
Log Message:
-----------
Restore doc content and tour.css that was omitted during branch from 2.12 to 2.14.
Modified Paths:
--------------
branches/R2_14/Docs/Users/Manual/Command_line.xml
branches/R2_14/Docs/Users/Manual/Compare_files.xml
branches/R2_14/Docs/Users/Manual/Configuration.xml
branches/R2_14/Docs/Users/Manual/Faq.xml
branches/R2_14/Docs/Users/Manual/Install.xml
branches/R2_14/Docs/Users/Manual/Intro_diffs.xml
branches/R2_14/Docs/Users/Manual/Locales.xml
branches/R2_14/Docs/Users/Manual/WinMerge_help.xml
branches/R2_14/Docs/Users/Manual/screenshots/OpenDlg1.png
branches/R2_14/Docs/Users/Manual/screenshots/ctx_menu_simple.png
branches/R2_14/Docs/Users/Manual/screenshots/equal.png
branches/R2_14/Docs/Users/Manual/screenshots/treeview-01.png
Added Paths:
-----------
branches/R2_14/Docs/Users/Manual/css/tour.css
Modified: branches/R2_14/Docs/Users/Manual/Command_line.xml
===================================================================
--- branches/R2_14/Docs/Users/Manual/Command_line.xml 2010-10-05 13:59:26 UTC (rev 7298)
+++ branches/R2_14/Docs/Users/Manual/Command_line.xml 2010-10-05 14:04:40 UTC (rev 7299)
@@ -33,6 +33,8 @@
<arg><option>/x</option></arg>
+ <arg><option>/xq</option></arg>
+
<arg><option>/s</option></arg>
<arg choice="opt" rep="norepeat"><option>/ul</option></arg>
@@ -134,6 +136,11 @@
</listitem>
<listitem>
+ <para><option>/xq</option> is similar to <option>/x</option> but does not
+ show the message about identical files. </para>
+ </listitem>
+
+ <listitem>
<indexterm>
<primary>WinMerge window</primary>
Modified: branches/R2_14/Docs/Users/Manual/Compare_files.xml
===================================================================
--- branches/R2_14/Docs/Users/Manual/Compare_files.xml 2010-10-05 13:59:26 UTC (rev 7298)
+++ branches/R2_14/Docs/Users/Manual/Compare_files.xml 2010-10-05 14:04:40 UTC (rev 7299)
@@ -1,12 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<article id="Compare_files">
- <title>Comparing and merging files<indexterm>
+ <?target dbhh topicname="IDH_Compare_files" topicid ="001"?>
+
+ <title>Comparing and merging text files<indexterm>
<primary>comparing files</primary>
</indexterm></title>
<para>This topic describes how to use the WinMerge File Compare window to
- compare and merge files. To understand the basic concepts about differences
- used here, we suggest you read <xref linkend="Intro_diffs" /> first.</para>
+ compare and merge text files. To understand the basic concepts about
+ differences discussed here, we suggest you read <xref linkend="Intro_diffs" />
+ first. See <xref linkend="Intro_diffs" /> for related information about hex
+ files. </para>
<section id="Compare_files_starting">
<title>Starting a file compare operation</title>
@@ -1931,4 +1935,4 @@
conflict file is also accepted in command line.</para>
</section>
</section>
-</article>
\ No newline at end of file
+</article>
Modified: branches/R2_14/Docs/Users/Manual/Configuration.xml
===================================================================
--- branches/R2_14/Docs/Users/Manual/Configuration.xml 2010-10-05 13:59:26 UTC (rev 7298)
+++ branches/R2_14/Docs/Users/Manual/Configuration.xml 2010-10-05 14:04:40 UTC (rev 7299)
@@ -1398,24 +1398,24 @@
<secondary>options</secondary>
</indexterm></title>
- <para>This page allows you to specify the codepage that the ANSI version of
- WinMerge uses for ANSI files. , and whether the codepage of certain file
- formats should be detected from the contents of the files.</para>
+ <para>WinMerge detects handles file encoding transparently, and in most
+ cases you should not need to change the default settings.This page allows
+ you to specify the codepages of certain file formats, should you need to. </para>
- <important>
+<!-- <important>
<para>The ANSI version of WinMerge (<filename>WinMerge.exe</filename>) is
normally installed only on Windows 9X and WME. On all other, newer Windows
systems, the Unicode version (<filename>WinMergeU.exe</filename>) is
installed. The Unicode version of WinMerge handles encoding transparently.
You should not need to change any settings in this page unless you are
running the ANSI version.</para>
- </important>
+ </important> -->
<note>
<para>A full explanation of text encoding and Windows codepages is beyond
- the scope of WinMerge documentation. Fortunately, there is lots of
- information about them on the Internet. For example, here are some places
- to start:</para>
+ the scope of WinMerge documentation. Fortunately, there is lots of
+ information about them on the Internet. For example, here are some
+ places to start:</para>
<itemizedlist>
<listitem>
@@ -1434,7 +1434,7 @@
</note>
<section>
- <title>Default codepage for ANSI files</title>
+ <title>Default codepage for non-Unicode files</title>
<para>Choose one of these radio buttons to set the default codepage that
WinMerge uses when handling ANSI files:</para>
Modified: branches/R2_14/Docs/Users/Manual/Faq.xml
===================================================================
--- branches/R2_14/Docs/Users/Manual/Faq.xml 2010-10-05 13:59:26 UTC (rev 7298)
+++ branches/R2_14/Docs/Users/Manual/Faq.xml 2010-10-05 14:04:40 UTC (rev 7299)
@@ -8,53 +8,43 @@
<qandaset>
<qandaentry>
<question>
- <para>Why are there two executable files,
- <filename>WinMerge.exe</filename> and
- <filename>WinMergeU.exe</filename>?<indexterm>
+ <para>Does WinMerge run on older Windows versions?</para>
+ </question>
+ <answer>
+ <para><indexterm>
<primary>WinMerge executables, Unicode and ANSI</primary>
</indexterm><indexterm>
<primary>Unicode</primary>
-
<secondary>WinMerge support</secondary>
</indexterm><indexterm>
<primary>ANSI</primary>
-
<secondary>WinMerge support</secondary>
- </indexterm></para>
- </question>
-
- <answer>
- <para>They support the different character encoding capabilities of
- older and newer versions of Windows.</para>
-
- <itemizedlist>
- <listitem>
- <para><filename>WinMerge.exe</filename> is an ANSI (8-bit)
- executable that works in all 32-bit Windows systems. It does not
- have Unicode support.</para>
-
- <para>Internally, it stores only ANSI characters (256
- possibilities). If you open a Unicode file, the characters must be
- converted to the ANSI codepage. Because there are over 100,000
- Unicode characters, and only 256 can be represented in the ANSI
- codepage, data loss can occur. Conversion might be approximate
- (for example, accents are lost) or impossible: characters are
- replaced by question marks ( <literal>?</literal> ).</para>
-
- <para><filename>WinMerge.exe</filename> also cannot open files
- with names outside the current ANSI codepage. For example,
- WinMerge.exe running on an English system cannot open a file with
- a Hebrew name.</para>
- </listitem>
-
- <listitem>
- <para><filename>WinMergeU.exe</filename> is a Unicode-enabled
- executable that works on Windows NT4, Windows 2000, and newer
- systems. Because it supports Unicode, it has none of the
- limitations listed above for
- <filename>WinMerge.exe</filename>.</para>
- </listitem>
- </itemizedlist>
+ </indexterm>Beginning with Version 2.14, WinMerge ended support for
+ older 32-bit Windows systems, including Windows 9x, ME, and NT4. </para>
+ <para>Previously, WinMerge provided an ANSI (8-bit) executable,
+ <filename>WinMerge.exe</filename>, that was designed around the
+ old Windows codepages. <filename>WinMerge.exe</filename> internally
+ stored only the ANSI characters supported by the Windows codepage.
+ This executable had severe limitations for working with Unicode: if
+ you opened a Unicode file, the characters were converted to the
+ Windows ANSI codepage. Because there are over 100,000 Unicode
+ characters, and only 256 can be represented in the ANSI character
+ set, data loss could occur. Conversion might be approximate (for
+ example, accents are lost) or impossible: characters were replaced
+ by question marks ( <literal>?</literal> ).</para>
+ <para><filename>WinMerge.exe</filename> also could not open files with
+ names outside the current ANSI codepage. For example, on an English
+ system, <filename>WinMerge.exe</filename> could not open a file with
+ a Hebrew name.</para>
+ <para>WinMerge developed the Unicode-enabled
+ <filename>WinMergeU.exe</filename> executable to work with newer,
+ Unicode-based Windows systems. <filename>WinMergeU.exe</filename>
+ has none of the limitations of the ANSI executable.</para>
+ <para><filename>WinMergeU.exe</filename> has been installed by default
+ for some time, and since few ANSI-based Windows systems remain, the
+ value of maintaining <filename>WinMerge.exe</filename> is miminal.
+ As of Version 2.14, WinMerge no longer includes
+ <filename>WinMerge.exe</filename> in the installer. </para>
</answer>
</qandaentry>
@@ -327,10 +317,8 @@
<answer>
<para>This is what we call a <glossterm>lossy
conversion</glossterm>.</para>
+ <!--<para>For Unicode files (UCS-2, UTF-8), use <filename>WinMergeU.exe</filename>.</para>-->
- <para>For Unicode files (UCS-2, UTF-8), use
- <filename>WinMergeU.exe</filename>.</para>
-
<para>For ANSI files, this is probably due to code-page problems. To
troubleshoot, click <menuchoice>
<guimenu>Edit</guimenu>
Modified: branches/R2_14/Docs/Users/Manual/Install.xml
===================================================================
--- branches/R2_14/Docs/Users/Manual/Install.xml 2010-10-05 13:59:26 UTC (rev 7298)
+++ branches/R2_14/Docs/Users/Manual/Install.xml 2010-10-05 14:04:40 UTC (rev 7299)
@@ -264,7 +264,7 @@
<title>Installing from an archive<indexterm>
<primary>archive, installing WinMerge from</primary>
</indexterm><indexterm>
- <primary>mfc71[u].dll runtime file</primary>
+ <primary>mfc71u.dll runtime file</primary>
</indexterm><indexterm>
<primary>msvcr71.dll runtime file</primary>
</indexterm><indexterm>
@@ -274,11 +274,11 @@
<para>WinMerge is pretty much independent of other system components. It is
not tightly integrated with Windows, and does not use many DLLs.</para>
- <para><filename>WinMerge[U].exe</filename> itself depends on
- <filename>MFC71[U].dll</filename> , <filename>MSVCR71.dll and
- MSVCP71.dll</filename>, in addition to some system DLLs. So if these DLLs
- are already installed on a system, only <filename>WinMerge[U].exe</filename>
- is needed to run WinMerge. The DLL files listed above are also available as
+ <para><filename>WinMergeU.exe</filename> itself depends on
+ <filename>MFC71U.dll</filename> , <filename>MSVCR71.dll and
+ MSVCP71.dll</filename>, in addition to some system DLLs. So if these DLLs
+ are already installed on a system, only <filename>WinMergeU.exe</filename>
+ is needed to run WinMerge. The DLL files listed above are also available as
a downloadable runtime package.</para>
<note>
Modified: branches/R2_14/Docs/Users/Manual/Intro_diffs.xml
===================================================================
--- branches/R2_14/Docs/Users/Manual/Intro_diffs.xml 2010-10-05 13:59:26 UTC (rev 7298)
+++ branches/R2_14/Docs/Users/Manual/Intro_diffs.xml 2010-10-05 14:04:40 UTC (rev 7299)
@@ -3,8 +3,8 @@
<title>Overview of file comparing and merging</title>
<para>This topic describes how WinMerge detects and displays differences
- within files, and demonstrates simple file comparing and merging
- operations.</para>
+ within text files, and demonstrates simple file comparing and merging
+ operations.</para>
<section id="Intro_diffs_comparing">
<title>Comparing files<indexterm>
Modified: branches/R2_14/Docs/Users/Manual/Locales.xml
===================================================================
--- branches/R2_14/Docs/Users/Manual/Locales.xml 2010-10-05 13:59:26 UTC (rev 7298)
+++ branches/R2_14/Docs/Users/Manual/Locales.xml 2010-10-05 14:04:40 UTC (rev 7299)
@@ -52,11 +52,10 @@
<orderedlist>
<listitem>
- <simpara>Create a folder named <filename
- class="directory">Languages</filename> under the WinMerge
- installation directory (where <filename>WinMerge.exe</filename> or
- <filename>WinMergeU.exe</filename> is located), if it does not
- already exist.</simpara>
+ <simpara>Create a folder named <filename class="directory"
+ >Languages</filename> under the WinMerge installation directory
+ (where <filename>WinMergeU.exe</filename> is located), if it does
+ not already exist.</simpara>
</listitem>
<listitem>
Modified: branches/R2_14/Docs/Users/Manual/WinMerge_help.xml
===================================================================
--- branches/R2_14/Docs/Users/Manual/WinMerge_help.xml 2010-10-05 13:59:26 UTC (rev 7298)
+++ branches/R2_14/Docs/Users/Manual/WinMerge_help.xml 2010-10-05 14:04:40 UTC (rev 7299)
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"./build/dtd/docbookx.dtd" [
-<!ENTITY AboutDoc SYSTEM "About_Doc.xml">
-<!ENTITY QuickStart SYSTEM "Quick_start.xml">
+<!ENTITY About_Doc SYSTEM "About_Doc.xml">
+<!ENTITY Quick_start SYSTEM "Quick_start.xml">
<!ENTITY Introduction SYSTEM "Introduction.xml">
<!ENTITY Install SYSTEM "Install.xml">
-<!ENTITY IntroductDiffing SYSTEM "Intro_diffs.xml">
-<!ENTITY OpenPaths SYSTEM "Open_paths.xml">
-<!ENTITY CompareDirs SYSTEM "Compare_dirs.xml">
-<!ENTITY CompareFiles SYSTEM "Compare_files.xml">
+<!ENTITY Intro_diffs SYSTEM "Intro_diffs.xml">
+<!ENTITY Open_paths SYSTEM "Open_paths.xml">
+<!ENTITY Compare_dirs SYSTEM "Compare_dirs.xml">
+<!ENTITY Compare_files SYSTEM "Compare_files.xml">
<!ENTITY Configuration SYSTEM "Configuration.xml">
<!ENTITY Locales SYSTEM "Locales.xml">
<!ENTITY Plugins SYSTEM "Plugins.xml">
<!ENTITY Filters SYSTEM "Filters.xml">
-<!ENTITY VersionControl SYSTEM "Version_control.xml">
-<!ENTITY CommandLine SYSTEM "Command_line.xml">
-<!ENTITY FAQ SYSTEM "Faq.xml">
-<!ENTITY ShortCuts SYSTEM "Shortcut_keys.xml">
+<!ENTITY Version_control SYSTEM "Version_control.xml">
+<!ENTITY Command_line SYSTEM "Command_line.xml">
+<!ENTITY Faq SYSTEM "Faq.xml">
+<!ENTITY Shortcut_keys SYSTEM "Shortcut_keys.xml">
]>
<book id="index">
<bookinfo>
@@ -84,28 +84,25 @@
</authorgroup>
</bookinfo>
- <!-- Note to maintainers:
- Not all doc files are included in this file. There are also fragment files
- included at the topic level. For example, several files include elements from
- replaceables.xml. Other fragment file is select-unpacker.xml.
- Please do not delete xml files in this directory unless you know for sure
- that they are not used. -->
+ <!--Note to maintainers: Not all doc files are included in this file. There are also fragment files included at the topic
+level. For example, several files include elements from replaceables.xml. Other fragment files are select-unpacker.xml
+and Text_encoding.xml. Pleaes do not delete xml files in this directory unless you know for sure that they are not used.-->
- &AboutDoc;
+ &About_Doc;
- &QuickStart;
+ &Quick_start;
&Introduction;
&Install;
- &IntroductDiffing;
+ &Intro_diffs;
- &OpenPaths;
+ &Open_paths;
- &CompareDirs;
+ &Compare_dirs;
- &CompareFiles;
+ &Compare_files;
&Configuration;
@@ -115,13 +112,13 @@
&Filters;
- &VersionControl;
+ &Version_control;
- &CommandLine;
+ &Command_line;
- &FAQ;
+ &Faq;
- &ShortCuts;
+ &Shortcut_keys;
<index id="word_index"></index>
</book>
Added: branches/R2_14/Docs/Users/Manual/css/tour.css
===================================================================
--- branches/R2_14/Docs/Users/Manual/css/tour.css (rev 0)
+++ branches/R2_14/Docs/Users/Manual/css/tour.css 2010-10-05 14:04:40 UTC (rev 7299)
@@ -0,0 +1,33 @@
+@import url("all.css");
+
+div.titlepage hr {display: none;}
+
+div.abstract p.title {display: none;}
+
+div.article {
+ margin: 10px 0 0 0;
+ padding: 0 20px 0 100px;
+ border: 1px dotted #004080;
+}
+
+div.header {
+ height: 50px;
+ background: #FFCC00;
+ border-top: 1px solid black;
+ border-bottom: 1px solid black;
+ padding: 1px 0 1px 0;
+ text-align: center;
+}
+
+div.header img {
+ border: none;
+}
+
+div.article h2 {
+ margin-left: -90px;
+}
+
+div.section h2 {
+ background-color: inherit;
+}
+
Modified: branches/R2_14/Docs/Users/Manual/screenshots/OpenDlg1.png
===================================================================
(Binary files differ)
Modified: branches/R2_14/Docs/Users/Manual/screenshots/ctx_menu_simple.png
===================================================================
(Binary files differ)
Modified: branches/R2_14/Docs/Users/Manual/screenshots/equal.png
===================================================================
(Binary files differ)
Modified: branches/R2_14/Docs/Users/Manual/screenshots/treeview-01.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-10-05 13:59:34
|
Revision: 7298
http://winmerge.svn.sourceforge.net/winmerge/?rev=7298&view=rev
Author: denisbradford
Date: 2010-10-05 13:59:26 +0000 (Tue, 05 Oct 2010)
Log Message:
-----------
Add tour files from 2.12, missing in 2.14 branch.
Added Paths:
-----------
branches/R2_14/Docs/Users/Manual/tour/
branches/R2_14/Docs/Users/Manual/tour/WinMerge_tour.xml
branches/R2_14/Docs/Users/Manual/tour/screenshots/
branches/R2_14/Docs/Users/Manual/tour/screenshots/OpenDlg_tr.png
branches/R2_14/Docs/Users/Manual/tour/screenshots/copyr_adv_btn_tr.png
branches/R2_14/Docs/Users/Manual/tour/screenshots/copyr_button_tr.png
branches/R2_14/Docs/Users/Manual/tour/screenshots/ctx_menu_advanced_tr.png
branches/R2_14/Docs/Users/Manual/tour/screenshots/ctx_menu_simple_tr.png
branches/R2_14/Docs/Users/Manual/tour/screenshots/currentdiff_btn_tr.png
branches/R2_14/Docs/Users/Manual/tour/screenshots/dragndrop_files_tr.png
branches/R2_14/Docs/Users/Manual/tour/screenshots/filecomp_diffpane_tr.png
branches/R2_14/Docs/Users/Manual/tour/screenshots/filecomp_diffpanesel_tr.png
branches/R2_14/Docs/Users/Manual/tour/screenshots/filecomp_merged_tr.png
branches/R2_14/Docs/Users/Manual/tour/screenshots/filecompwin_tr.png
branches/R2_14/Docs/Users/Manual/tour/screenshots/foldercomp_tr.png
branches/R2_14/Docs/Users/Manual/tour/screenshots/mergebtns_on_tr.png
branches/R2_14/Docs/Users/Manual/tour/screenshots/nav_uparrow_btn_tr.png
branches/R2_14/Docs/Users/Manual/tour/screenshots/nextdiff_btn_tr.png
branches/R2_14/Docs/Users/Manual/tour/screenshots/treeview_tr.png
branches/R2_14/Docs/Users/Manual/tour/tour_comparingdirs.xml
branches/R2_14/Docs/Users/Manual/tour/tour_comparingfiles.xml
branches/R2_14/Docs/Users/Manual/tour/tour_sel_targets.xml
Property changes on: branches/R2_14/Docs/Users/Manual/tour
___________________________________________________________________
Added: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Added: bugtraq:logregex
+ (\d{6,})
Added: branches/R2_14/Docs/Users/Manual/tour/WinMerge_tour.xml
===================================================================
--- branches/R2_14/Docs/Users/Manual/tour/WinMerge_tour.xml (rev 0)
+++ branches/R2_14/Docs/Users/Manual/tour/WinMerge_tour.xml 2010-10-05 13:59:26 UTC (rev 7298)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"../build/dtd/docbookx.dtd">
+<book id="WinMerge_tour">
+ <bookinfo>
+ <title>WinMerge <xi:include href="../replaceables.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xpointer="element(version)" /> Quick Tour</title>
+
+ <abstract>
+ <para>WinMerge is an Open Source differencing and merging tool for
+ Windows. Use it to detect changes between files and folders, and then to
+ merge changes selectively. You can use WinMerge by itself, or launch it
+ from a version control system or another application.</para>
+
+ <para>When you compare two files or folders, the result is displayed in
+ the WinMerge window. The WinMerge window's visual display and functions
+ are designed to help you see differences between your targets, and to
+ merge selected differences if you want to.</para>
+
+ <formalpara>
+ <title>In a file comparison</title>
+
+ <para>WinMerge shows differences between lines. The built-in text editor
+ provides syntax highlighting for several programming languages and other
+ file formats.</para>
+ </formalpara>
+
+ <formalpara>
+ <title>In a folder comparison</title>
+
+ <para>WinMerge indicates various kinds of differences between the files
+ that the folders contain.</para>
+ </formalpara>
+
+ <para>Take this brief, guided tour if you are considering installing
+ WinMerge, or if you just want to see what the tool looks like and what you
+ can do with it. The topics below describe the main WinMerge features. They
+ include some simple examples of comparing files and folders, and merging
+ differences between them.</para>
+
+ <para>This tour just scratches the surface. For detailed information and
+ guidance about using WinMerge, see the Help that is installed with
+ WinMerge and available <ulink url="http://winmerge.org/docs/manual/">on
+ our Web site</ulink>.</para>
+ </abstract>
+ </bookinfo>
+
+ <toc></toc>
+
+ <xi:include href="tour_sel_targets.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" xpointer="element(/1)" />
+
+ <xi:include href="tour_comparingfiles.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+ <xi:include href="tour_comparingdirs.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" />
+</book>
Property changes on: branches/R2_14/Docs/Users/Manual/tour/screenshots
___________________________________________________________________
Added: bugtraq:url
+ http://sourceforge.net/support/tracker.php?aid=%BUGID%
Added: bugtraq:logregex
+ (\d{6,})
Added: branches/R2_14/Docs/Users/Manual/tour/screenshots/OpenDlg_tr.png
===================================================================
(Binary files differ)
Property changes on: branches/R2_14/Docs/Users/Manual/tour/screenshots/OpenDlg_tr.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/R2_14/Docs/Users/Manual/tour/screenshots/copyr_adv_btn_tr.png
===================================================================
(Binary files differ)
Property changes on: branches/R2_14/Docs/Users/Manual/tour/screenshots/copyr_adv_btn_tr.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/R2_14/Docs/Users/Manual/tour/screenshots/copyr_button_tr.png
===================================================================
(Binary files differ)
Property changes on: branches/R2_14/Docs/Users/Manual/tour/screenshots/copyr_button_tr.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/R2_14/Docs/Users/Manual/tour/screenshots/ctx_menu_advanced_tr.png
===================================================================
(Binary files differ)
Property changes on: branches/R2_14/Docs/Users/Manual/tour/screenshots/ctx_menu_advanced_tr.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/R2_14/Docs/Users/Manual/tour/screenshots/ctx_menu_simple_tr.png
===================================================================
(Binary files differ)
Property changes on: branches/R2_14/Docs/Users/Manual/tour/screenshots/ctx_menu_simple_tr.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/R2_14/Docs/Users/Manual/tour/screenshots/currentdiff_btn_tr.png
===================================================================
(Binary files differ)
Property changes on: branches/R2_14/Docs/Users/Manual/tour/screenshots/currentdiff_btn_tr.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/R2_14/Docs/Users/Manual/tour/screenshots/dragndrop_files_tr.png
===================================================================
(Binary files differ)
Property changes on: branches/R2_14/Docs/Users/Manual/tour/screenshots/dragndrop_files_tr.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/R2_14/Docs/Users/Manual/tour/screenshots/filecomp_diffpane_tr.png
===================================================================
(Binary files differ)
Property changes on: branches/R2_14/Docs/Users/Manual/tour/screenshots/filecomp_diffpane_tr.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/R2_14/Docs/Users/Manual/tour/screenshots/filecomp_diffpanesel_tr.png
===================================================================
(Binary files differ)
Property changes on: branches/R2_14/Docs/Users/Manual/tour/screenshots/filecomp_diffpanesel_tr.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/R2_14/Docs/Users/Manual/tour/screenshots/filecomp_merged_tr.png
===================================================================
(Binary files differ)
Property changes on: branches/R2_14/Docs/Users/Manual/tour/screenshots/filecomp_merged_tr.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/R2_14/Docs/Users/Manual/tour/screenshots/filecompwin_tr.png
===================================================================
(Binary files differ)
Property changes on: branches/R2_14/Docs/Users/Manual/tour/screenshots/filecompwin_tr.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/R2_14/Docs/Users/Manual/tour/screenshots/foldercomp_tr.png
===================================================================
(Binary files differ)
Property changes on: branches/R2_14/Docs/Users/Manual/tour/screenshots/foldercomp_tr.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/R2_14/Docs/Users/Manual/tour/screenshots/mergebtns_on_tr.png
===================================================================
(Binary files differ)
Property changes on: branches/R2_14/Docs/Users/Manual/tour/screenshots/mergebtns_on_tr.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/R2_14/Docs/Users/Manual/tour/screenshots/nav_uparrow_btn_tr.png
===================================================================
(Binary files differ)
Property changes on: branches/R2_14/Docs/Users/Manual/tour/screenshots/nav_uparrow_btn_tr.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/R2_14/Docs/Users/Manual/tour/screenshots/nextdiff_btn_tr.png
===================================================================
(Binary files differ)
Property changes on: branches/R2_14/Docs/Users/Manual/tour/screenshots/nextdiff_btn_tr.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/R2_14/Docs/Users/Manual/tour/screenshots/treeview_tr.png
===================================================================
(Binary files differ)
Property changes on: branches/R2_14/Docs/Users/Manual/tour/screenshots/treeview_tr.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/R2_14/Docs/Users/Manual/tour/tour_comparingdirs.xml
===================================================================
--- branches/R2_14/Docs/Users/Manual/tour/tour_comparingdirs.xml (rev 0)
+++ branches/R2_14/Docs/Users/Manual/tour/tour_comparingdirs.xml 2010-10-05 13:59:26 UTC (rev 7298)
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<article id="tour_comparingdirs">
+ <title>Comparing Folders</title>
+
+ <para>In addition to comparing files in WinMerge, you can compare the contents
+ of folders. WinMerge shows which files are different, and provides functions
+ to merge files between folders.</para>
+
+ <section>
+ <title>The Folder Compare window</title>
+
+ <para>If you <link linkend="tour_sel_targets">launch a WinMerge compare
+ operation</link> on two folders, the Folder Compare window opens:</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="screenshots/foldercomp_tr.png" format="PNG" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Folder Compare window</phrase>
+ </textobject>
+ </mediaobject>
+
+ <para>The Folder Compare window lists the files and subfolders found in the
+ target folders. Each row compares a file or subfolder in the two selected
+ folder targets. As with the File Compare window, the targets are represented
+ on <quote>left</quote> and <quote>right</quote> sides.</para>
+
+ <para>These columns tells you whether corresponding right and left items in
+ each row are identical, different, or exist on only one side. The asterisk
+ in either the left or right date highlights the more recent date. The icons
+ in the Filename column provide visual cues for each type of file, like text
+ or binary files, and how the two sides are different. Icons are also used to
+ mark files and folders that are found only on one side.</para>
+
+ <para>The columns are sortable. By default, rows are sorted by filename in
+ descending alphabetical order. Click the Filename column title to reverse
+ the sorting. Or, maybe you're only interested in rows that are different. If
+ so, click the Comparison result column title to sort by result type. This
+ groups different files together so they're easy to see.</para>
+
+ <para>If you want to display more information, a simple customization lets
+ you add additional columns, including file creation time, file encoding
+ type, file size, and even the number of differences found.</para>
+
+ <para>The Folder Compare window supports common operations on files, like
+ editing, copying, deleting, moving, and renaming (moving is equivalent to a
+ copy operation followed by a delete). You can use these file operations and
+ WinMerge functions to merge the contents of folders. You can also open files
+ using associated programs or external editors. You can even launch file
+ compare operations on individual files from the Folder Compare
+ window.</para>
+
+ <para>The <inlinemediaobject>
+ <imageobject>
+ <imagedata contentwidth="23"
+ fileref="screenshots/nav_uparrow_btn_tr.png" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Navigator up arrow button</phrase>
+ </textobject>
+ </inlinemediaobject> <guibutton>up arrow</guibutton> button at the top of
+ the Filename column navigates to the parent folder of each target.</para>
+
+ <para>As we mentioned earlier, the WinMerge main window can contain multiple
+ Folder Compare or File Compare windows, and each Compare window displays the
+ result of a single comparison. In the preceding screen shot, the File
+ Compare window is maximized within the main window:</para>
+ </section>
+
+ <section>
+ <title>Navigating folder differences</title>
+
+ <para>To navigate differences at the folder level:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Use conventional keyboard and mouse actions to move between rows.
+ To select a difference, simply click its row.</para>
+ </listitem>
+
+ <listitem>
+ <para>Use the Difference buttons in the toolbar to select differences
+ systematically. For example, click the <inlinemediaobject>
+ <imageobject>
+ <imagedata contentdepth="15"
+ fileref="screenshots/nextdiff_btn_tr.png" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Next Difference button</phrase>
+ </textobject>
+ </inlinemediaobject> <guibutton>Next Difference</guibutton> button in
+ the toolbar (or press <keycombo>
+ <keycap>Alt</keycap>
+
+ <keycap>Enter</keycap>
+ </keycombo>) to select the next row that is different, automatically
+ skipping identical rows.</para>
+ </listitem>
+ </itemizedlist>
+ </section>
+
+ <section>
+ <title>Comparing subfolders</title>
+
+ <para>So far we have looked at a non-recursive comparison, which includes
+ files only in the root of the two folders you select, not any subfolders
+ that they contain. To compare their subfolders, you have to launch a new
+ compare operation. For example, in the preceding comparison, double-click
+ the <filename>Common</filename> folder icon to open a new File Compare
+ window that compares the two <filename>Common</filename> folders.</para>
+
+ <para>WinMerge can also compare folders recursively. A recursive comparison
+ includes all the files in all subfolders, so you don't need to launch
+ separate compare operations to navigate nested folders. </para>
+
+ <para>For targets with many nested folders and files, a recursive comparison
+ can can take longer than a non-recursive comparison, and the result can be
+ harder to read. In this case, consider displaying the results of recursive
+ comparisons in a hierachical tree view instead of the default tabular view.
+ Folders are initially collapsed for a compact, readable display — expand
+ just the ones whose contents you want to see:</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="screenshots/treeview_tr.png" format="PNG" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Folder Compare window</phrase>
+ </textobject>
+ </mediaobject>
+ </section>
+
+ <section>
+ <title>Merging folder differences</title>
+
+ <para>Merging in the Folder Compare window involves either copying items
+ (files or folders) between folders, or deleting items.</para>
+
+ <para>For example, suppose you want to synchronize two folders. In the
+ preceding screen shot, you can tell from the asterisk that the left version
+ of <filename>AboutDlg.h</filename> is more recent. So, to merge
+ <filename>AboutDlg.h</filename> select the row and click the
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata contentwidth="17" fileref="screenshots/copyr_button_tr.png" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Copy Right button</phrase>
+ </textobject>
+ </inlinemediaobject> <guibutton>Copy Right</guibutton> button in the
+ toolbar.</para>
+
+ <para>When you merge a file or folder, the value in the <guilabel>Comparison
+ result</guilabel> column changes to <literal>Identical</literal>.</para>
+
+ <para>Of course, you might not always want to merge entire files or folders.
+ For example, you might want to merge selected differences within the files,
+ or to examine the differences within files before merging them. In such
+ cases, you can double-click a file to launch a file comparison. WinMerge
+ displays the result in a new File Compare window, where you can see and
+ merge the line-level differences.</para>
+ </section>
+</article>
\ No newline at end of file
Added: branches/R2_14/Docs/Users/Manual/tour/tour_comparingfiles.xml
===================================================================
--- branches/R2_14/Docs/Users/Manual/tour/tour_comparingfiles.xml (rev 0)
+++ branches/R2_14/Docs/Users/Manual/tour/tour_comparingfiles.xml 2010-10-05 13:59:26 UTC (rev 7298)
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<article id="tour_comparingfiles">
+ <title>Comparing Files</title>
+
+ <para>When you compare two files, WinMerge shows the differences between their
+ lines. To demonstrate comparing and merging files, consider these two small
+ text files named <filename>File1</filename> and
+ <filename>File2</filename>:</para>
+
+ <formalpara>
+ <title>File1:</title>
+
+ <para><screen>You can cage a swallow,
+can't you?
+But you can't swallow
+a cage, can you?</screen></para>
+ </formalpara>
+
+ <formalpara>
+ <title>File2:</title>
+
+ <para><screen>You can cage a swallow.
+But you can't swallow
+a cage. Can you?</screen></para>
+ </formalpara>
+
+ <section>
+ <title>The File Compare window</title>
+
+ <para>If you <link linkend="tour_sel_targets">launch a WinMerge compare
+ operation</link> on two files, the File Compare window opens. This screen
+ shot compares our two sample files:</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="screenshots/filecompwin_tr.png" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Compare Files screen shot</phrase>
+ </textobject>
+ </mediaobject>
+
+ <para>The File Compare window makes it easy to see differences between lines
+ in your files. It also has special functions for merging different lines
+ from one file to the other, and basic editing capabilities for more detailed
+ merging within lines. Notice these basic features of the File Compare
+ window:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>In the bottom right corner of the window, the status bar tells you
+ how many differences WinMerge detects.</para>
+
+ <para>The Location pane indicates where the differences are located in
+ the files. The Location pane is helpful for working with long files,
+ where you can't see all the differences at once in the File
+ panes.</para>
+ </listitem>
+
+ <listitem>
+ <para>Differences are marked in the File panes by a gold background
+ color. In this comparison, the first difference is a block of two lines;
+ the second difference is a single line at the end.</para>
+ </listitem>
+
+ <listitem>
+ <para>Notice that the first difference has an extra blank line on the
+ right side. Why does this blank line appear, since it doesn't exist in
+ the source file?</para>
+
+ <para>The empty line is a placeholder in WinMerge that does not change
+ the source file. WinMerge inserts blank lines on one side of a
+ difference whenever the other side has more lines. The extra lines,
+ marked with a gray background color by default, keep the left and right
+ sides vertically aligned for ease of comparison. That is, every
+ difference begins on the same line in the File panes, even when they are
+ on different lines in the source files. Without this feature, files of
+ different lengths would be hard to compare.</para>
+ </listitem>
+
+ <listitem>
+ <para>The third line is identical in both files, so it has no difference
+ color (its background is white).</para>
+ </listitem>
+
+ <listitem>
+ <para>Within differences, WinMerge highlights the text that makes the
+ lines different. By default, different words are highlighted. To see
+ more detail you can highlight changes at the character level; to see
+ less, you can turn off all highlighting within lines.</para>
+ </listitem>
+ </itemizedlist>
+
+ <note>
+ <para>The WinMerge main window can contain multiple File Compare (and
+ Folder compare) windows. Each File Compare window displays the result of a
+ single comparison, representing the two files in the left and right File
+ panes. In our screen shot, the File Compare window is maximized within the
+ main window:</para>
+ </note>
+ </section>
+
+ <section>
+ <title>Navigating line differences</title>
+
+ <para>In the File Compare window you can use standard mouse and cursor
+ actions to select and edit text in either File pane. But in WinMerge,
+ working with text and working with differences are not the same thing.
+ WinMerge provides special functions to navigate differences.</para>
+
+ <para>For example, click anywhere in an area that is marked as a difference,
+ then click the <inlinemediaobject>
+ <imageobject>
+ <imagedata contentdepth="15" fileref="screenshots/currentdiff_btn_tr.png" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Current Difference button</phrase>
+ </textobject>
+ </inlinemediaobject> <guibutton>Current Difference</guibutton> button in
+ the toolbar.</para>
+
+ <para>The next two screen shots show the first difference in our sample
+ comparison, after it's selected. When you select a difference, several
+ things happen:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>The Selected Difference background color (red by default)
+ highlights the difference in the File panes. The Location Pane also
+ highlights the selected difference and marks its location with arrows.
+ :</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="screenshots/filecomp_diffpanesel_tr.png" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Difference selected in Compare Files panes</phrase>
+ </textobject>
+ </mediaobject>
+ </listitem>
+
+ <listitem>
+ <para>The selected difference is loaded in the Diff pane, where you can
+ examine it in isolation from other differences.</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="screenshots/filecomp_diffpane_tr.png" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Compare Files Diff Pane</phrase>
+ </textobject>
+ </mediaobject>
+ </listitem>
+
+ <listitem>
+ <para>All the merge buttons in the toolbar are enabled:
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="screenshots/mergebtns_on_tr.png" />
+ </imageobject>
+ </inlinemediaobject></para>
+ </listitem>
+
+ <listitem>
+ <para>The status bar confirms which difference is selected.</para>
+ </listitem>
+ </itemizedlist>
+ </section>
+
+ <section>
+ <title>Merging differences in files</title>
+
+ <para>You can merge differences at two levels in the File Compare
+ window:</para>
+
+ <variablelist>
+ <varlistentry>
+ <term>Line-level differences</term>
+
+ <listitem>
+ <para>As we have seen, a difference includes one or more lines. Use
+ the WinMerge merge functions to copy an entire selected difference
+ from one side to the other. For example, click the <inlinemediaobject>
+ <imageobject>
+ <imagedata contentdepth="15"
+ fileref="screenshots/copyr_adv_btn_tr.png" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Copy Right and Advance button</phrase>
+ </textobject>
+ </inlinemediaobject> <guibutton>Copy Right and Advance</guibutton>
+ button.</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="screenshots/filecomp_merged_tr.png" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Compare Files window after merge</phrase>
+ </textobject>
+ </mediaobject>
+
+ <para>Notice the changes:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>The first difference is gone: the lines are now identical
+ and have no difference color.</para>
+ </listitem>
+
+ <listitem>
+ <para>WinMerge automatically selects the next difference, skipping
+ over the identical line. The Location Pane also moves its
+ indicator.</para>
+ </listitem>
+
+ <listitem>
+ <para>The status bar indicates that only one difference
+ remains.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>You can see that the navigation and merge functions provide a
+ good way to systematically step through all the differences in a
+ comparison.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>Differences within lines</term>
+
+ <listitem>
+ <para>Instead of merging entire differences using the Merge functions,
+ you can change text within them by manually editing either file
+ directly in the File Compare window. For example, if you don't want to
+ use either side of the first difference, you can delete the line. Or,
+ you might replace <quote>words</quote> on the right side with
+ <quote>text</quote>.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <para>After you finish merging, you can click <menuchoice>
+ <guimenu>File</guimenu>
+
+ <guimenuitem>Save</guimenuitem>
+ </menuchoice> to save changes to both sides. Or, to save just one side,
+ click <menuchoice>
+ <guimenu>File</guimenu>
+
+ <guimenuitem>Save Left</guimenuitem>
+ </menuchoice> or <menuchoice>
+ <guimenu>File</guimenu>
+
+ <guimenuitem>Save</guimenuitem>
+ </menuchoice>.</para>
+
+ <para>This was a trivial example — there were only two differences and we
+ only merged one of them. But you can use the methods shown here to navigate
+ and merge line differences between files of any length.</para>
+
+ <!--
+ <para>When you launch a file compare operation, WinMerge opens the File
+ Compare window. The window features two columns representing the
+ <quote>left</quote> and <quote>right</quote> files that you are comparing, and
+ indicates whether the corresponding lines on each side are identical or
+ different. WinMerge can also highlight the content within lines that makes
+ them different.</para>
+
+ <para>You can tailor how differences are detected and displayed. For example,
+ if whitespace differences are not meaningful to your comparison, you can
+ choose to ignore whitespace or different line ending encodings. You can change
+ the colors used to highlight line differences and the text within them.</para>
+
+ <para>The Compare window has special functions that make it easy to step
+ through line differences quickly and systematically, and functions to merge
+ differences from one file to the other if you want to. You can also edit the
+ files directly in the Compare window.</para>
+-->
+ </section>
+</article>
Added: branches/R2_14/Docs/Users/Manual/tour/tour_sel_targets.xml
===================================================================
--- branches/R2_14/Docs/Users/Manual/tour/tour_sel_targets.xml (rev 0)
+++ branches/R2_14/Docs/Users/Manual/tour/tour_sel_targets.xml 2010-10-05 13:59:26 UTC (rev 7298)
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<article id="tour_sel_targets">
+ <title>Starting WinMerge compare operations</title>
+
+ <para>Every WinMerge compare operation has two targets: either two files or
+ two folders. WinMerge makes it easy to select targets and launch comparisons
+ from different places in your Windows environment. Here are some commonly used
+ methods:</para>
+
+ <section>
+ <title>Drag and drop</title>
+
+ <para>Select two files or two folders in Windows Explorer and drag them to
+ the WinMerge shortcut on your desktop, or into the WinMerge window if it's
+ already open.</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="screenshots/dragndrop_files_tr.png" format="PNG" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Drag and drop to WinMerge Desktop icon</phrase>
+ </textobject>
+ </mediaobject>
+
+ <note>
+ <para>If you drop only one file or folder into the WinMerge icon or
+ window, WinMerge opens the <xref linkend="sel_targets_dialog" />, where
+ you can specify the other target.</para>
+ </note>
+ </section>
+
+ <section>
+ <title>Windows Explorer context menu shortcuts</title>
+
+ <para>WinMerge has an option that adds a <guimenuitem>WinMerge</guimenuitem>
+ shortcut to the context menu when you select one or two files or folders in
+ Windows Explorer. Choosing the shortcut opens WinMerge and compares the
+ selected items:</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="screenshots/ctx_menu_simple_tr.png" format="PNG" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Windows Explorer basic context menu integration</phrase>
+ </textobject>
+ </mediaobject>
+
+ <para>For even more flexibility, you can replace the basic
+ <guimenuitem>WinMerge</guimenuitem> shortcut with a set of advanced
+ shortcuts. Use these shortcuts to select objects separately, even from
+ different Explorer folders or windows. The next screen shot shows a typical
+ sequence: we choose the first compare target in one Explorer view, then the
+ second target in another Explorer view.</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="screenshots/ctx_menu_advanced_tr.png" format="PNG" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Windows Explorer advanced context menu integration</phrase>
+ </textobject>
+ </mediaobject>
+ </section>
+
+ <section id="sel_targets_dialog">
+ <title>Select Files or Folder dialog</title>
+
+ <para>For maximum flexibility in launching compare operations, click
+ <menuchoice>
+ <guimenu>File</guimenu>
+
+ <guimenuitem>Open</guimenuitem>
+ </menuchoice> in the main WinMerge window to open the Select Files or
+ Folders dialog:</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="screenshots/OpenDlg_tr.png" format="PNG" />
+ </imageobject>
+
+ <textobject>
+ <phrase>Select Files or Folders window</phrase>
+ </textobject>
+ </mediaobject>
+
+ <para>This dialog lets you browse anywhere for the files or folders to
+ compare. Alternatively, you might choose a recently-used file or folder from
+ the <guilabel>Left</guilabel> and <guilabel>Right</guilabel> drop-down
+ controls. You can even drag a file or folder from Windows Explorer into the
+ <guilabel>Left</guilabel> or <guilabel>Right</guilabel> field. A message
+ prompts you if either target is not found, or if you entered a combination
+ of file and folder (WinMerge can't compare files to folders!) in the two
+ fields.</para>
+
+ <para>The dialog contains several options to tailor your compare operation,
+ including these:</para>
+
+ <variablelist>
+ <varlistentry>
+ <term>Filter</term>
+
+ <listitem>
+ <para>Use this option to apply a filter to narrow the scope of the
+ comparison. There two kinds of filters:</para>
+
+ <formalpara>
+ <title>File filters</title>
+
+ <para>Include or exclude files that match regular expressions. For
+ example, the expression <code>^test</code> matches files that start
+ with the string, <literal>test</literal>, like
+ <filename>testheaders.h</filename>. WinMerge installs a number of
+ filter files that specify commonly-excluded files for various
+ languages, like C#, C++, and Visual Basic. You can edit these files
+ and, of course, add your own.</para>
+ </formalpara>
+
+ <formalpara>
+ <title>Line filters</title>
+
+ <para>Ignore lines <emphasis>within</emphasis> files that match
+ patterns. For example, the expression <code>^[1-5]00</code> ignores
+ lines beginning with numbers <literal>100</literal>,
+ <literal>200</literal>, <literal>300</literal>,
+ <literal>400</literal>, and <literal>500</literal>.</para>
+ </formalpara>
+
+ <para>WinMerge provides the Filters dialog for creating and managing
+ filters.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>Include Subfolders</term>
+
+ <listitem>
+ <para>This option lets you control the depth of a folder comparison.
+ Enabling it compares all folder levels, which might take a while if
+ there are a lot of files. Disable it to compare only the top level of
+ the target folders. This is the fastest option, and you can
+ <quote>drill down</quote> into nested folders later in the Compare
+ Folders window.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </section>
+
+ <section>
+ <title>Command line</title>
+
+ <para>The WinMerge CLI includes commands with a full set of parameters and
+ options that you can use in a script or Command Prompt window to launch
+ comparisons. This example compares two folders recursively and displays the
+ result in the WinMerge window:</para>
+
+ <para><userinput>WinMergeU <filename>/r C:\folder1</filename> <filename
+ class="directory"><filename>C:\folder2</filename>
+ </filename></userinput></para>
+ </section>
+
+ <section>
+ <title>Version control systems</title>
+
+ <para>If you run TortoiseSVN, TortoiseCVS, or Rational ClearCase, you can
+ configure your version control system to open WinMerge directly. That is, if
+ you compare files using one of these VCS tools, WinMerge opens instead of
+ the tool's native diff utility.</para>
+
+ <note>
+ <para>Another handy VCS integration automatically launches your version
+ control system's checkout dialog whenever you change a managed file in the
+ WinMerge window. This integration works with version control systems that
+ lock files, specifically ClearCase and Visual Source Safe.</para>
+ </note>
+ </section>
+</article>
\ 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: <den...@us...> - 2010-10-04 15:07:25
|
Revision: 7297
http://winmerge.svn.sourceforge.net/winmerge/?rev=7297&view=rev
Author: denisbradford
Date: 2010-10-04 15:07:18 +0000 (Mon, 04 Oct 2010)
Log Message:
-----------
Update changes to doc tour build from 12.2.
Added Paths:
-----------
branches/R2_14/Docs/Users/Manual/build/build_tour.bat
branches/R2_14/Docs/Users/Manual/build/build_tour.xsl
Removed Paths:
-------------
branches/R2_14/Docs/Users/Manual/build/build_html_withads.xsl
Deleted: branches/R2_14/Docs/Users/Manual/build/build_html_withads.xsl
===================================================================
--- branches/R2_14/Docs/Users/Manual/build/build_html_withads.xsl 2010-10-04 14:22:51 UTC (rev 7296)
+++ branches/R2_14/Docs/Users/Manual/build/build_html_withads.xsl 2010-10-04 15:07:18 UTC (rev 7297)
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0">
-
-<!-- ********************************************************************
- build_html_withads.xsl
- WinMerge customization of the XSL DocBook stylesheet distribution.
- Contains customized templates and parameters for the Web site version
- of help; all other styles are inherited from the WinMerge
- build_common.xsl and the stock DocBook stylesheets in ../build/xsl.
-
- See build_common.xsl for editing instructions.
- ********************************************************************
- Changes
- Created July 2008
- ******************************************************************** -->
-
-<xsl:import href="build_html.xsl"/>
-
-<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-html/docbook.xsl
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-<!-- WinMerge: commercialize the header -->
-<xsl:template name="user.header.content">
- <div id="ads">
- <script type="text/javascript"><!--
- google_ad_client = "pub-1411904495533584";
- google_ad_width = 728;
- google_ad_height = 90;
- google_ad_format = "728x90_as";
- google_ad_type = "text";
- google_ad_channel ="";
- google_color_border = "FFCC00";
- google_color_bg = "FFFFCC";
- google_color_link = "0000FF";
- google_color_text = "000000";
- google_color_url = "008000";
- //--></script>
- <script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
- </script>
- </div>
-</xsl:template>
-
-</xsl:stylesheet>
Added: branches/R2_14/Docs/Users/Manual/build/build_tour.bat
===================================================================
--- branches/R2_14/Docs/Users/Manual/build/build_tour.bat (rev 0)
+++ branches/R2_14/Docs/Users/Manual/build/build_tour.bat 2010-10-04 15:07:18 UTC (rev 7297)
@@ -0,0 +1,47 @@
+@echo off
+
+call configuration.bat
+
+set docbook_inputfile=..\tour\WinMerge_tour.xml
+set docbook_use_stylesheet=build_tour.xsl
+set docbook_outputdir=%docbook_build_path%\tour
+set docbook_outputfile=index.html
+set ads=false
+if "%1" == "withads" goto withads
+if not "%1" == "" goto withadserror
+goto start
+
+:withads
+set ads=true
+echo **************************************
+echo * The manual includes advertisements *
+echo **************************************
+goto start
+
+:withadserror
+echo "%1" is a invalid argument. Please use "withads", if you want advertisements in the manual.
+goto end
+
+:start
+if not exist "%docbook_outputdir%" mkdir "%docbook_outputdir%"
+
+echo Copy images ...
+if not exist "%docbook_outputdir%\images" mkdir "%docbook_outputdir%\images"
+copy "..\images\*.gif" "%docbook_outputdir%\images\."
+copy "..\images\*.png" "%docbook_outputdir%\images\."
+
+echo Copy screenshots...
+if not exist "%docbook_outputdir%\screenshots" mkdir "%docbook_outputdir%\screenshots"
+copy "..\tour\screenshots\*.*" "%docbook_outputdir%\screenshots\."
+
+echo Copy stylesheets...
+if not exist "%docbook_outputdir%\css" mkdir "%docbook_outputdir%\css"
+copy "..\css\*.css" "%docbook_outputdir%\css"
+
+echo Create Tour HTML file...
+%docbook_java_exe% %docbook_java_parameters% -cp %docbook_saxon_jar%;%docbook_xerces_jar%;%docbook_saxon_xsl% -Djavax.xml.parsers.DocumentBuilderFactory=%DBFACTORY% -Djavax.xml.parsers.SAXParserFactory=%SPFACTORY% -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=%XINCLUDE% com.icl.saxon.StyleSheet -o %docbook_outputdir%/%docbook_outputfile% %docbook_inputfile% %docbook_use_stylesheet% withads=%ads%"
+
+echo Finished!
+
+:end
+@echo on
\ No newline at end of file
Added: branches/R2_14/Docs/Users/Manual/build/build_tour.xsl
===================================================================
--- branches/R2_14/Docs/Users/Manual/build/build_tour.xsl (rev 0)
+++ branches/R2_14/Docs/Users/Manual/build/build_tour.xsl 2010-10-04 15:07:18 UTC (rev 7297)
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
+
+<!-- ********************************************************************
+ build_tour.xsl
+ WinMerge customization of the XSL DocBook stylesheet distribution.
+ Contains customized templates and parameters for generating
+ a single HTML document; all other styles are inherited from the WinMerge
+ build_common.xsl and the stock DocBook stylesheets in ../build/xsl.
+
+ See build_common.xsl for editing instructions.
+ ********************************************************************
+ Changes:
+ Created July 2009
+ ******************************************************************** -->
+
+<xsl:import href="../build/xsl/html/docbook.xsl"/>
+<xsl:import href="build_common.xsl"/>
+
+<xsl:output method="html"
+ encoding="ISO-8859-1"
+ indent="yes"/>
+
+<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+Custom parameters
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+<!-- Define suffix to appear after title text in head/title element of
+every topic -->
+<xsl:param name="headtitle.suffix" select="' - WinMerge 2.12 Quicktour'"/>
+
+<!-- Detect if we're displaying ads for the Web pages -->
+<xsl:param name="withads">false</xsl:param>
+
+<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ html/param.xsl parameters
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+<xsl:param name="section.autolabel" select="0"/>
+<xsl:param name="generate.toc">book toc</xsl:param>
+<xsl:param name="generate.meta.abstract" select="0"/>
+
+
+<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+html/docbook.xsl
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+<!-- Link to the appropriate css stylesheets -->
+<xsl:template name="user.head.content">
+ <link rel="stylesheet" type="text/css" href="css/tour.css" />
+ <link rel="stylesheet" type="text/css" media="print" href="css/print.css" />
+</xsl:template>
+
+<!-- For web pages add banner image and Google ad scripts -->
+<xsl:template name="user.header.content">
+ <div class="header"><a href="http://www.winmerge.org">
+ <img src="images/head.gif" alt="winmerge.org"/></a>
+ </div>
+ <xsl:if test="$withads = 'true'">
+ <xsl:call-template name="header.ads"/>
+ </xsl:if>
+</xsl:template>
+
+</xsl:stylesheet>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-10-04 14:22:57
|
Revision: 7296
http://winmerge.svn.sourceforge.net/winmerge/?rev=7296&view=rev
Author: denisbradford
Date: 2010-10-04 14:22:51 +0000 (Mon, 04 Oct 2010)
Log Message:
-----------
Manually merge doc build changes not included in merge from 2_12 branch
Modified Paths:
--------------
branches/R2_14/Docs/Users/Manual/build/build_common.xsl
branches/R2_14/Docs/Users/Manual/build/build_html.bat
branches/R2_14/Docs/Users/Manual/build/build_html.xsl
Modified: branches/R2_14/Docs/Users/Manual/build/build_common.xsl
===================================================================
--- branches/R2_14/Docs/Users/Manual/build/build_common.xsl 2010-10-02 14:32:33 UTC (rev 7295)
+++ branches/R2_14/Docs/Users/Manual/build/build_common.xsl 2010-10-04 14:22:51 UTC (rev 7296)
@@ -20,8 +20,8 @@
********************************************************************
Changes
Created July 2008
+ 3 Aug 2009: Added 'header.ads' custom template
******************************************************************** -->
-
<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
html/param.xsl parameters
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
@@ -40,6 +40,7 @@
<xsl:param name="chunk.section.depth" select="0" />
<xsl:param name="generate.toc">book toc,title article nop</xsl:param>
<xsl:param name="toc.section.depth">1</xsl:param>
+<xsl:param name="runinhead.default.title.end.punct">:</xsl:param>
<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
common/local.l10n.xml
@@ -48,6 +49,9 @@
<xsl:param name="local.l10n.xml" select="document('')"/>
<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
<l:l10n language="en">
+ <l:context name="xref">
+ <l:template name="section" text="%t"/>
+ </l:context>
<l:context name="xref-number-and-title">
<l:template name="section" text="%t"/>
</l:context>
@@ -57,6 +61,7 @@
<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
html/docbook.xsl
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+<!-- Link to the appropriate css stylesheets -->
<xsl:template name="user.head.content">
<link rel="stylesheet" type="text/css" href="css/all.css" />
<link rel="stylesheet" type="text/css" media="print" href="css/print.css" />
@@ -112,4 +117,31 @@
</span>
</xsl:template>
+<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+WinMerge custom templates
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+<!-- This template adds ads to the top of HTML pages when you use the
+ 'build html withads' command line to generate commercialized
+ pages for the WinMerge web site. -->
+<xsl:template name="header.ads">
+ <div id="ads">
+ <script type="text/javascript"><!--
+ google_ad_client = "pub-1411904495533584";
+ google_ad_width = 728;
+ google_ad_height = 90;
+ google_ad_format = "728x90_as";
+ google_ad_type = "text";
+ google_ad_channel ="";
+ google_color_border = "FFCC00";
+ google_color_bg = "FFFFCC";
+ google_color_link = "0000FF";
+ google_color_text = "000000";
+ google_color_url = "008000";
+ //--></script>
+ <script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+ </script>
+ </div>
+</xsl:template>
+
+
</xsl:stylesheet>
Modified: branches/R2_14/Docs/Users/Manual/build/build_html.bat
===================================================================
--- branches/R2_14/Docs/Users/Manual/build/build_html.bat 2010-10-02 14:32:33 UTC (rev 7295)
+++ branches/R2_14/Docs/Users/Manual/build/build_html.bat 2010-10-04 14:22:51 UTC (rev 7296)
@@ -3,14 +3,16 @@
call configuration.bat
set docbook_inputfile=..\WinMerge_help.xml
+set tour_inputfile=..\tour\WinMerge_tour.xml
set docbook_use_stylesheet=build_html.xsl
set docbook_outputdir=%docbook_build_path%\html
+set ads=false
if "%1" == "withads" goto withads
if not "%1" == "" goto withadserror
goto start
:withads
-set docbook_use_stylesheet=build_html_withads.xsl
+set ads=true
echo **************************************
echo * The manual includes advertisements *
echo **************************************
@@ -23,7 +25,7 @@
:start
if not exist "%docbook_outputdir%" mkdir "%docbook_outputdir%"
-echo Copy images...
+echo Copy images ...
if not exist "%docbook_outputdir%\images" mkdir "%docbook_outputdir%\images"
copy "..\images\*.gif" "%docbook_outputdir%\images\."
copy "..\images\*.png" "%docbook_outputdir%\images\."
@@ -38,11 +40,10 @@
echo Copy stylesheets...
if not exist "%docbook_outputdir%\css" mkdir "%docbook_outputdir%\css"
-copy "..\css\all.css" "%docbook_outputdir%\css\all.css"
-copy "..\css\print.css" "%docbook_outputdir%\css\print.css"
+copy "..\css\*.css" "%docbook_outputdir%\css"
-echo Create HTML files...
-%docbook_java_exe% %docbook_java_parameters% -cp %docbook_saxon_jar%;%docbook_xerces_jar%;%docbook_saxon_xsl% -Djavax.xml.parsers.DocumentBuilderFactory=%DBFACTORY% -Djavax.xml.parsers.SAXParserFactory=%SPFACTORY% -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=%XINCLUDE% com.icl.saxon.StyleSheet %docbook_inputfile% %docbook_use_stylesheet% base.dir=%docbook_outputdir%\
+echo Create Manual HTML files...
+%docbook_java_exe% %docbook_java_parameters% -cp %docbook_saxon_jar%;%docbook_xerces_jar%;%docbook_saxon_xsl% -Djavax.xml.parsers.DocumentBuilderFactory=%DBFACTORY% -Djavax.xml.parsers.SAXParserFactory=%SPFACTORY% -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=%XINCLUDE% com.icl.saxon.StyleSheet %docbook_inputfile% %docbook_use_stylesheet% base.dir=%docbook_outputdir%\ withads=%ads%
echo Finished!
Modified: branches/R2_14/Docs/Users/Manual/build/build_html.xsl
===================================================================
--- branches/R2_14/Docs/Users/Manual/build/build_html.xsl 2010-10-02 14:32:33 UTC (rev 7295)
+++ branches/R2_14/Docs/Users/Manual/build/build_html.xsl 2010-10-04 14:22:51 UTC (rev 7296)
@@ -13,19 +13,27 @@
********************************************************************
Changes:
Created July 2008
+ 3 Aug 2009: Added 'user.header.content' template
******************************************************************** -->
<xsl:import href="../build/xsl/html/chunk.xsl"/>
<xsl:import href="build_common.xsl"/>
-<!-- Define suffix to appear after title text in head/title element of every topic -->
+
+<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+Custom parameters
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+<!-- Define suffix to appear after title text in head/title element of
+every topic -->
<xsl:param name="headtitle.suffix" select="' - WinMerge 2.12 Manual'"/>
+<!-- Detect if we're displaying ads for the Web pages -->
+<xsl:param name="withads">false</xsl:param>
<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
html/docbook.xsl
- Add suffix to head title text
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+<!-- Add headtitle.suffix to head title text -->
<xsl:template name="head.content">
<xsl:param name="node" select="."/>
<xsl:param name="title">
@@ -108,4 +116,12 @@
<xsl:apply-templates select="." mode="head.keywords.content"/>
</xsl:template>
+<!-- For web pages add banner image. Add Google ad scripts
+ if 'withads' param is set to true. -->
+<xsl:template name="user.header.content">
+ <xsl:if test="$withads = 'true'">
+ <xsl:call-template name="header.ads"/>
+ </xsl:if>
+</xsl:template>
+
</xsl:stylesheet>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-10-02 14:32:39
|
Revision: 7295
http://winmerge.svn.sourceforge.net/winmerge/?rev=7295&view=rev
Author: gerundt
Date: 2010-10-02 14:32:33 +0000 (Sat, 02 Oct 2010)
Log Message:
-----------
PATCH: [ 3079966 ] Installer: Don't install quick launch icon for Windows 7
Modified Paths:
--------------
branches/R2_14/Docs/Users/ChangeLog.txt
branches/R2_14/Installer/InnoSetup/WinMerge.iss
Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-02 14:31:53 UTC (rev 7294)
+++ branches/R2_14/Docs/Users/ChangeLog.txt 2010-10-02 14:32:33 UTC (rev 7295)
@@ -11,6 +11,7 @@
Installer: Drop Windows 9x/ME/NT4 support and use Microsoft runtime
libraries installer (#3070254)
Installer: Remove Uninstall shortcut from start menu folder (#3076909)
+ Installer: Don't install quick launch icon for Windows 7 (#3079966)
Bugfix: WinMerge was vulnerable to DLL hijacking as described in
Microsoft Security Advisory (2269637) (#33056008)
Bugfix: Location pane focus enabled "Save" (#3022292)
Modified: branches/R2_14/Installer/InnoSetup/WinMerge.iss
===================================================================
--- branches/R2_14/Installer/InnoSetup/WinMerge.iss 2010-10-02 14:31:53 UTC (rev 7294)
+++ branches/R2_14/Installer/InnoSetup/WinMerge.iss 2010-10-02 14:32:33 UTC (rev 7295)
@@ -272,7 +272,7 @@
Name: TortoiseSVN; Description: {cm:IntegrateTortoiseSVN}; GroupDescription: {cm:OptionalFeatures}; Check: TortoiseSVNInstalled; MinVersion: 0,5.0.2195sp3
Name: ClearCase; Description: {cm:IntegrateClearCase}; GroupDescription: {cm:OptionalFeatures}; Check: ClearCaseInstalled
Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
-Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}
+Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; OnlyBelowVersion: 0,6.1
[InstallDelete]
; Diff.txt is a file left over from previous versions of WinMerge (before version 2.0), we just delete it to be nice.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
