5.7

7 files changed, 42 insertions, 35 deletions

diff --git a/BUILD/Help/html/External Applications.html b/BUILD/Help/html/External Applications.html
index 16a7134d..f9d939dc 100644
--- a/BUILD/Help/html/External Applications.html
+++ b/BUILD/Help/html/External Applications.html
@@ -5,7 +5,7 @@
 	<TITLE></TITLE>
 	<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2  (Win32)">
 	<META NAME="CREATED" CONTENT="20091206;16574000">
-	<META NAME="CHANGED" CONTENT="20120511;23111200">
+	<META NAME="CHANGED" CONTENT="20120904;11283300">
 	<META NAME="Info 1" CONTENT="">
 	<META NAME="Info 2" CONTENT="">
 	<META NAME="Info 3" CONTENT="">
@@ -28,22 +28,26 @@ applications</FONT></FONT></H2>
 <P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">By
 default FreeFileSync opens the operating system's standard file
 browser on each mouse double-click by invoking &quot;<FONT FACE="Courier New, monospace">explorer
-/select, &quot;%name&quot;</FONT>&quot; on Windows and &quot;<FONT FACE="Courier New, monospace">xdg-open
-&quot;%dir&quot;</FONT>&quot; on Linux.</FONT></P>
+/select, &quot;%item_path%&quot;</FONT>&quot; on Windows and
+&quot;<FONT FACE="Courier New, monospace">xdg-open &quot;%item_folder%&quot;</FONT>&quot;
+on Linux.</FONT></P>
 <P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">However
 you are free to integrate other external applications into
 FreeFileSync: navigate to &quot;</FONT><FONT FACE="Tahoma, sans-serif"><I>Menu
 -&gt; Advanced -&gt; Global settings: External Applications</I></FONT><FONT FACE="Tahoma, sans-serif">&quot;
 and add or replace a command string. The first entry is executed when
 double-clicking a row on main grid while all other entries are only
-available via right-click context menu. The following macros may be
-used:</FONT></P>
+available via right-click context menu. The following internal macros
+may be used:</FONT></P>
 <P STYLE="margin-left: 1.32cm; margin-bottom: 0cm"><SPAN ID="Rahmen3" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: none; padding: 0cm; background: #e6e6e6">
 	<P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-right: 0.98cm; margin-bottom: 0cm">
-	<FONT FACE="Courier New, monospace">%name&nbsp;&nbsp;&nbsp;- full
-	file or directory name<BR>%dir &nbsp;&nbsp;&nbsp;- directory part
-	only<BR>%nameCo&nbsp;- Other side's counterpart to %name<BR>%dirCo&nbsp;&nbsp;-
-	Other side's counterpart to %dir</FONT></P>
+	<FONT FACE="Courier New, monospace">%item_path%&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-
+	<FONT FACE="Tahoma, sans-serif">full file or folder
+	name</FONT><BR>%item_folder% &nbsp;&nbsp;- <FONT FACE="Tahoma, sans-serif">folder
+	part only</FONT><BR>%item2_path%&nbsp;&nbsp;&nbsp;&nbsp;- <FONT FACE="Tahoma, sans-serif">Other
+	side's counterpart to %item_path%</FONT><BR>%item2_folder%&nbsp;&nbsp;-
+	<FONT FACE="Tahoma, sans-serif">Other side's counterpart to
+	%item_folder%</FONT></FONT></P>
 </SPAN><BR CLEAR=LEFT><BR>
 </P>
 <P STYLE="margin-bottom: 0cm"><BR>
@@ -52,17 +56,18 @@ used:</FONT></P>
 <UL>
 	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Start
 	visual difference tool:<BR><FONT FACE="Courier New, monospace">&quot;C:\Program
-	Files\WinMerge\WinMergeU.exe&quot; &quot;%name&quot; &quot;%nameCo&quot;<BR>&nbsp;</FONT></FONT></P>
+	Files\WinMerge\WinMergeU.exe&quot; &quot;%item_path%&quot;
+	&quot;%item2_path%&quot;<BR>&nbsp;</FONT></FONT></P>
 	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Show
 	file in Windows Explorer:<BR><FONT FACE="Courier New, monospace">explorer
-	/select, &quot;%name&quot;<BR>&nbsp;</FONT></FONT></P>
+	/select, &quot;%item_path%&quot;<BR>&nbsp;</FONT></FONT></P>
 	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Open
 	file in associated application:</FONT><BR><FONT FACE="Courier New, monospace">cmd
-	/c start &quot;&quot; &quot;%name&quot; </FONT><FONT FACE="Tahoma, sans-serif">or
-	simply</FONT> <FONT FACE="Courier New, monospace">&quot;%name&quot;</FONT><FONT FACE="Tahoma, sans-serif"><BR>&nbsp;</FONT></P>
+	/c start &quot;&quot; &quot;%item_path%&quot; </FONT><FONT FACE="Tahoma, sans-serif">or
+	simply</FONT> <FONT FACE="Courier New, monospace">&quot;%item_path%&quot;</FONT><FONT FACE="Tahoma, sans-serif"><BR>&nbsp;</FONT></P>
 	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Open
 	console dialog:<BR><FONT FACE="Courier New, monospace">cmd /k cd /D
-	&quot;%dir&quot;<BR>&nbsp;</FONT></FONT></P>
+	&quot;%item_folder%&quot;<BR>&nbsp;</FONT></FONT></P>
 </UL>
 <P STYLE="margin-left: 1.46cm; margin-bottom: 0cm"><SPAN ID="Rahmen1" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: 1px solid #000080; padding: 0.05cm; background: #ccccff">
 	<P ALIGN=LEFT STYLE="margin-left: 0.79cm; margin-right: 0.98cm; margin-bottom: 0cm">
diff --git a/BUILD/Help/html/FreeFileSync.html b/BUILD/Help/html/FreeFileSync.html
index f08d1600..6004791c 100644
--- a/BUILD/Help/html/FreeFileSync.html
+++ b/BUILD/Help/html/FreeFileSync.html
@@ -5,7 +5,7 @@
 	<TITLE></TITLE>
 	<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2  (Win32)">
 	<META NAME="CREATED" CONTENT="20091206;16574000">
-	<META NAME="CHANGED" CONTENT="20120504;2110200">
+	<META NAME="CHANGED" CONTENT="20120903;14424200">
 	<META NAME="Info 1" CONTENT="">
 	<META NAME="Info 2" CONTENT="">
 	<META NAME="Info 3" CONTENT="">
@@ -29,7 +29,7 @@ Folder Comparison and Synchronization -</SPAN></I></FONT></H3>
 <H3 CLASS="western" ALIGN=LEFT>Usage:</H3>
 <OL>
 	<LI VALUE=1><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Choose
-	left and right directories.<BR></FONT><IMG SRC="../img/SourceTarget.png" NAME="Grafik4" ALIGN=TEXTTOP BORDER=0></P>
+	left and right directories.<BR></FONT><IMG SRC="../img/SourceTarget.png" NAME="Grafik4" ALIGN=TEXTTOP WIDTH=427 HEIGHT=50 BORDER=0></P>
 	<P STYLE="margin-bottom: 0cm">&nbsp;</P>
 	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">&quot;</FONT><FONT FACE="Tahoma, sans-serif"><I>Compare</I></FONT><FONT FACE="Tahoma, sans-serif">&quot;
 	them.<BR></FONT><IMG SRC="../img/CompareButton.png" NAME="Grafik1" ALIGN=BOTTOM WIDTH=178 HEIGHT=40 BORDER=0></P>
@@ -49,33 +49,36 @@ Folder Comparison and Synchronization -</SPAN></I></FONT></H3>
 <H3 CLASS="western" STYLE="page-break-before: always"><FONT FACE="Tahoma, sans-serif">Main
 Dialog:</FONT></H3>
 <OL>
-	<P STYLE="margin-bottom: 0cm"><IMG SRC="../img/MainDialog.png" NAME="Grafik5" ALIGN=BOTTOM WIDTH=743 HEIGHT=438 BORDER=0></P>
+	<P STYLE="margin-bottom: 0cm"><IMG SRC="../img/MainDialog.png" NAME="Grafik5" ALIGN=BOTTOM BORDER=0></P>
 </OL>
 <P STYLE="margin-bottom: 0cm"><BR>
 </P>
 <OL>
 	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4>Start
 	comparison</FONT></FONT></P>
-	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4>Specify
+	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4>Setup
 	comparison settings</FONT></FONT></P>
-	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4>Set
-	sync configuration</FONT></FONT></P>
+	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4>Setup
+	synchronization settings</FONT></FONT></P>
 	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4>Start
 	synchronization</FONT></FONT></P>
+	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4>Tree
+	overview panel</FONT></FONT></P>
 	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4>Add
 	additional folder pairs</FONT></FONT></P>
-	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4>Swap
-	sides</FONT></FONT></P>
 	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4>Select
-	left and right directories</FONT></FONT></P>
+	left and right folders</FONT></FONT></P>
+	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4>Synchronization
+	preview </FONT></FONT>
+	</P>
 	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4>Save/load
 	configuration</FONT></FONT></P>
 	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4>Filter
 	files</FONT></FONT></P>
-	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4>Specify
-	category for display</FONT></FONT></P>
+	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4>Select
+	categories for preview</FONT></FONT></P>
 	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><FONT SIZE=4>Synchronization
-	statistics/preview</FONT></FONT></P>
+	statistics</FONT></FONT></P>
 </OL>
 <P STYLE="margin-bottom: 0cm; border-top: none; border-bottom: 1px solid #000000; border-left: none; border-right: none; padding-top: 0cm; padding-bottom: 0.07cm; padding-left: 0cm; padding-right: 0cm">
 <BR>
diff --git a/BUILD/Help/html/Links.html b/BUILD/Help/html/Links.html
index 5fcafa9d..2616b9ee 100644
--- a/BUILD/Help/html/Links.html
+++ b/BUILD/Help/html/Links.html
@@ -27,7 +27,7 @@ on SourceForge:<BR><A HREF="http://sourceforge.net/projects/freefilesync">http:/
 </P>
 <P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">For
 feedback, suggestions or bug-reports you can write an email
-to:<BR><A HREF="mailto:zhnmju123@gmx.de">zhnmju123 [at] gmx [dot] de</A></FONT></P>
+to:<BR><A HREF="mailto:zenju@gmx.de">zenju [at] gmx [dot] de</A></FONT></P>
 <P STYLE="margin-bottom: 0cm"><BR>
 </P>
 <P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Or
@@ -35,6 +35,6 @@ report directly to:<BR><A HREF="http://sourceforge.net/tracker/?group_id=234430"
 <P STYLE="margin-bottom: 0cm"><BR>
 </P>
 <P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Support
-the FreeFileSync project:<BR><A HREF="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=zhnmju123@gmx.de&amp;lc=US&amp;currency_code=EUR">Paypal</A></FONT></P>
+the FreeFileSync project:<BR><A HREF="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=zenju@gmx.de&amp;no_shipping=1&amp;lc=US&amp;currency_code=EUR">Donate via PayPal</A></FONT></P>
 </BODY>
 </HTML>
\ No newline at end of file
diff --git a/BUILD/Help/html/Run as Service.html b/BUILD/Help/html/Run as Service.html
index b1bc5171..7fdd1393 100644
--- a/BUILD/Help/html/Run as Service.html
+++ b/BUILD/Help/html/Run as Service.html
@@ -5,7 +5,7 @@
 	<TITLE></TITLE>
 	<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2  (Win32)">
 	<META NAME="CREATED" CONTENT="20091206;16574000">
-	<META NAME="CHANGED" CONTENT="20120511;23105500">
+	<META NAME="CHANGED" CONTENT="20120903;12221300">
 	<META NAME="Info 1" CONTENT="">
 	<META NAME="Info 2" CONTENT="">
 	<META NAME="Info 3" CONTENT="">
@@ -30,9 +30,9 @@ following step-by-step guide describes how to setup RealtimeSync (or
 any other application) as a Windows Service. This is necessary if the
 tool shall run on the SYSTEM account independent from currently
 logged-in users. If you are the only user and all you want is to
-start RealtimeSync automatically then it's better to place a link
-into Windows' Autostart folder, specifying RealtimeSync.exe and the
-.ffs_batch or .ffs_real file as argument.</FONT></P>
+start RealtimeSync automatically then it's better to <B>place a link
+into Windows' Autostart folder</B>, specifying RealtimeSync.exe and
+the .ffs_batch or .ffs_real file as argument.</FONT></P>
 <P STYLE="margin-bottom: 0cm"><BR>
 </P>
 <P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Reference:
diff --git a/BUILD/Help/html/Schedule a Batch Job.html b/BUILD/Help/html/Schedule a Batch Job.html
index 19b1eca2..93fa804e 100644
--- a/BUILD/Help/html/Schedule a Batch Job.html
+++ b/BUILD/Help/html/Schedule a Batch Job.html
@@ -35,12 +35,11 @@ a Batch Job</FONT></FONT></H2>
 	&quot;Close progress dialog&quot; located in synchronization
 	settings. <B>Note:</B> Even if the progress dialog is not shown at
 	the beginning, a user can make it visible <B>during</B>
-	synchronization by double-clicking the FreeFileSync systray icon.<BR><IMG SRC="../img/SetupBatch.png" NAME="Grafik3" ALIGN=BOTTOM WIDTH=560 HEIGHT=342 BORDER=0></FONT></P>
+	synchronization by double-clicking the FreeFileSync systray icon.<BR><IMG SRC="../img/SetupBatch.png" NAME="Grafik3" ALIGN=BOTTOM BORDER=0></FONT></P>
 	<P STYLE="margin-bottom: 0cm">&nbsp;</P>
 	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">In
 	order to prevent error or warning popup messages from stopping
-	progress, set &quot;<I>Error handling</I>&quot; to either &quot;<I>Ignore
-	errors</I>&quot; or &quot;<I>Exit instantly</I>&quot;.</FONT></P>
+	progress, set &quot;<I>Error handling</I>&quot; to either &quot;<I>Ignore</I>&quot; or &quot;<I>Exit</I>&quot;.</FONT></P>
 	<P STYLE="margin-bottom: 0cm">&nbsp;</P>
 	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Setup
 	your operating system's scheduler</FONT></P>
diff --git a/BUILD/Help/img/MainDialog.png b/BUILD/Help/img/MainDialog.png
index 984e1305..bc909996 100644
--- a/BUILD/Help/img/MainDialog.png
+++ b/BUILD/Help/img/MainDialog.png
diff --git a/BUILD/Help/img/SetupBatch.png b/BUILD/Help/img/SetupBatch.png
index 469d632b..71ff0996 100644
--- a/BUILD/Help/img/SetupBatch.png
+++ b/BUILD/Help/img/SetupBatch.png