diff options
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD/Changelog.txt | 17 | ||||
| -rw-r--r-- | BUILD/FreeFileSync.chm | bin | 433104 -> 433358 bytes | |||
| -rw-r--r-- | BUILD/Help/html/Backup Strategies.html | 16 | ||||
| -rw-r--r-- | BUILD/Help/html/Batch Scripting.html | 5 | ||||
| -rw-r--r-- | BUILD/Help/html/Macros.html | 10 | ||||
| -rw-r--r-- | BUILD/Help/html/RealtimeSync.html | 26 | ||||
| -rw-r--r-- | BUILD/Languages/english_uk.lng | 14 | ||||
| -rw-r--r-- | BUILD/Languages/german.lng | 15 | ||||
| -rw-r--r-- | BUILD/Resources.zip | bin | 222370 -> 225594 bytes | |||
| -rw-r--r-- | BUILD/Sync_Complete.wav | bin | 364076 -> 460504 bytes |
10 files changed, 63 insertions, 40 deletions
diff --git a/BUILD/Changelog.txt b/BUILD/Changelog.txt index 8e9bdc27..6696584b 100644 --- a/BUILD/Changelog.txt +++ b/BUILD/Changelog.txt @@ -2,6 +2,23 @@ |FreeFileSync| -------------- +Changelog v5.9 +-------------- +Scroll grid directly under mouse cursor +Move files directly to recycle bin without parent "FFS 2012-05-15 131513" temporary folders +Offer $HOME directory alias in directory dropdown list (Linux) +Support for tilde (~) character in input folder paths (Linux) +New environment variables for RealtimeSync: %change_action%, "%change_path% +Use Internet Explorer proxy settings for new version check (Windows) +Show proper error message after failed symlink creation +Start comparison directly when double-clicking config list +New batch return code: "Synchronization completed with warnings" +Hide files that won't be copied by default if direction "none" is part of the rule set (e.g. update variant) +New sync completion sound +Remember save config and folder picker dialog positions separately +Fixed sync completion sound not playing (Ubuntu) + + Changelog v5.8 -------------- New icon theme diff --git a/BUILD/FreeFileSync.chm b/BUILD/FreeFileSync.chm Binary files differindex f680d349..e4eba632 100644 --- a/BUILD/FreeFileSync.chm +++ b/BUILD/FreeFileSync.chm diff --git a/BUILD/Help/html/Backup Strategies.html b/BUILD/Help/html/Backup Strategies.html index 95f33a47..4cc4dd46 100644 --- a/BUILD/Help/html/Backup Strategies.html +++ b/BUILD/Help/html/Backup Strategies.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;23131500"> + <META NAME="CHANGED" CONTENT="20121007;13361000"> <META NAME="Info 1" CONTENT=""> <META NAME="Info 2" CONTENT=""> <META NAME="Info 3" CONTENT=""> @@ -28,12 +28,12 @@ Strategies</FONT></FONT></H2> <P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>1. Full backup with versioning of old files</B></FONT></P> <P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">In -synchronization settings select and specify "Versioning" -for deletion handling. FreeFileSync will place files that have been -deleted or overwritten with newer versions into corresponding -time-stamped sub directories. This provides a space-optimized way to -save all older versions of files separately while the most recent -ones are available in main source and target directories.</FONT></P> +synchronization settings select "Versioning" for deletion +handling. FreeFileSync will move files that have been deleted or +overwritten with newer versions into the provided directory and +append a time-stamp. This is effectively a space-optimized way to +save all older versions of files separately while the recent ones are +available in main source and target directories.</FONT></P> <P STYLE="margin-bottom: 0cm"><BR> </P> <P STYLE="margin-bottom: 0cm"><BR> @@ -58,7 +58,7 @@ Base directories are set up accordingly:</FONT></P> </SPAN><BR CLEAR=LEFT><BR> </P> <P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Latter -will be interactively replaced with the current date during +will be dynamically replaced with the current date during synchronization. In order to further automate this process, you can create a *.ffs_batch file with this configuration and choose "<I>ignore errors</I>" to avoid the popup message that target directory is diff --git a/BUILD/Help/html/Batch Scripting.html b/BUILD/Help/html/Batch Scripting.html index 526d3d79..b812ee1e 100644 --- a/BUILD/Help/html/Batch Scripting.html +++ b/BUILD/Help/html/Batch Scripting.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;23115700"> + <META NAME="CHANGED" CONTENT="20121005;17531200"> <META NAME="Info 1" CONTENT=""> <META NAME="Info 2" CONTENT=""> <META NAME="Info 3" CONTENT=""> @@ -39,7 +39,8 @@ as argument) it returns one of the following status codes:</FONT></P> <P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><SPAN STYLE="font-style: normal"><B>Return Codes</B></SPAN><SPAN STYLE="font-style: normal"><BR>0 - Synchronization completed successfully<BR>1 - Synchronization - completed with errors<BR>2 - Synchronization was aborted</SPAN></FONT></P> + completed with warnings<BR>2 - Synchronization completed with + errors<BR>3 - Synchronization was aborted</SPAN></FONT></P> </UL> </SPAN><BR CLEAR=LEFT><BR> </P> diff --git a/BUILD/Help/html/Macros.html b/BUILD/Help/html/Macros.html index 33d16757..c491c22c 100644 --- a/BUILD/Help/html/Macros.html +++ b/BUILD/Help/html/Macros.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="20120907;12344300"> + <META NAME="CHANGED" CONTENT="20121007;19184600"> <META NAME="Info 1" CONTENT=""> <META NAME="Info 2" CONTENT=""> <META NAME="Info 3" CONTENT=""> @@ -40,10 +40,10 @@ macros:</B></FONT></P> </FONT>current time, format [hhmmss], e. g. "<FONT FACE="Courier New, monospace">201340</FONT>"<BR><FONT FACE="Courier New, monospace">%date% - </FONT>current date, e. g. "<FONT FACE="Courier New, monospace">2010-07-13</FONT>"<BR><BR><FONT FACE="Courier New, monospace">%weekday% - </FONT>day of the week, e. g. "<FONT FACE="Courier New, monospace">Monday</FONT>"<BR><FONT FACE="Courier New, monospace">%week% - - </FONT>calendar week, e. g. "<FONT FACE="Courier New, monospace">28</FONT>"<BR><BR><FONT FACE="Courier New, monospace">%day% - - </FONT>current day, e. g. "<FONT FACE="Courier New, monospace">21</FONT>"<BR><FONT FACE="Courier New, monospace">%month% - - </FONT>current month, e. g. "<FONT FACE="Courier New, monospace">July</FONT>"<BR><FONT FACE="Courier New, monospace">%year% - - </FONT>current year, e. g. "<FONT FACE="Courier New, monospace">2010</FONT>"<BR><BR><FONT FACE="Courier New, monospace">%hour% - + </FONT>calendar week, e. g. "<FONT FACE="Courier New, monospace">28</FONT>"<BR><BR><FONT FACE="Courier New, monospace">%year% - + </FONT>current year, e. g. "<FONT FACE="Courier New, monospace">2010</FONT>"<BR><FONT FACE="Courier New, monospace">%month% - + </FONT>current month, e. g. "<FONT FACE="Courier New, monospace">July</FONT>"<BR><FONT FACE="Courier New, monospace">%day% - + </FONT>current day, e. g. "<FONT FACE="Courier New, monospace">21</FONT>"<BR><BR><FONT FACE="Courier New, monospace">%hour% - </FONT>current hour, e. g. "<FONT FACE="Courier New, monospace">20</FONT>"<BR><FONT FACE="Courier New, monospace">%min% - </FONT>current minute, e. g. "<FONT FACE="Courier New, monospace">13</FONT>"<BR><FONT FACE="Courier New, monospace">%sec% - </FONT>current second, e. g. "<FONT FACE="Courier New, monospace">40</FONT>"</FONT></P> diff --git a/BUILD/Help/html/RealtimeSync.html b/BUILD/Help/html/RealtimeSync.html index 49187f40..73f9dd60 100644 --- a/BUILD/Help/html/RealtimeSync.html +++ b/BUILD/Help/html/RealtimeSync.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;21275200"> + <META NAME="CHANGED" CONTENT="20121017;18372400"> <META NAME="Info 1" CONTENT=""> <META NAME="Info 2" CONTENT=""> <META NAME="Info 3" CONTENT=""> @@ -50,7 +50,7 @@ but also sets up the command line to execute the </FONT><FONT FACE="Courier New, Now press "</FONT><FONT FACE="Tahoma, sans-serif"><I>Start</I></FONT><FONT FACE="Tahoma, sans-serif">" to begin monitoring.</FONT></P> <UL> - <P STYLE="margin-bottom: 0cm"><IMG SRC="../img/RealtimeSync.png" NAME="Grafik3" ALIGN=MIDDLE BORDER=0></P> + <P STYLE="margin-bottom: 0cm"><IMG SRC="../img/RealtimeSync.png" NAME="Grafik3" ALIGN=MIDDLE WIDTH=469 HEIGHT=437 BORDER=0></P> </UL> <P STYLE="margin-bottom: 0cm"><BR> </P> @@ -58,10 +58,10 @@ to begin monitoring.</FONT></P> <UL> <P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Note</B></FONT></P> <LI><P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">The - command should </FONT><FONT FACE="Tahoma, sans-serif"><B>not</B></FONT><FONT FACE="Tahoma, sans-serif"> - </FONT><FONT FACE="Tahoma, sans-serif"><B>block</B></FONT><FONT FACE="Tahoma, sans-serif"> - progress. Make sure the FreeFileSync batch job does not show any - popup dialogs. See notes in <A HREF="Batch%20Scripting.html">Batch + command should </FONT><FONT FACE="Tahoma, sans-serif"><B>not</B></FONT> + <FONT FACE="Tahoma, sans-serif"><B>block</B></FONT> <FONT FACE="Tahoma, sans-serif">progress. + Make sure the FreeFileSync batch job does not show any popup + dialogs. See notes in <A HREF="Batch%20Scripting.html">Batch Scripting</A>.</FONT><SPAN STYLE="text-decoration: none"><FONT FACE="Tahoma, sans-serif"><BR> </FONT></SPAN></P> <LI><P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">The settings dialog can be skipped by passing a RealtimeSync @@ -90,7 +90,7 @@ ffs_batch configuration into the USB stick's root directory and have it called when the stick is mounted. Then configure RealtimeSync as shown in the following:</FONT></P> <UL> - <P><IMG SRC="../img/WatchUsbInsert.png" NAME="Grafik2" ALIGN=BOTTOM BORDER=0></P> + <P><IMG SRC="../img/WatchUsbInsert.png" NAME="Grafik2" ALIGN=BOTTOM WIDTH=446 HEIGHT=411 BORDER=0></P> </UL> <P STYLE="margin-bottom: 0cm"><BR> </P> @@ -106,9 +106,10 @@ files are modified in "</FONT><FONT FACE="Courier New, monospace">H:\Data</ <P STYLE="margin-left: 1.46cm; margin-bottom: 0cm"><SPAN ID="Rahmen2" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: 1px solid #000080; padding: 0.05cm; background: #ccccff"> <UL> <P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Note<BR></B></FONT><FONT FACE="Tahoma, sans-serif">The - n</FONT><SPAN STYLE="text-decoration: none"><FONT FACE="Tahoma, sans-serif">ame - of the last changed file is written to an environment variable - named </FONT></SPAN><SPAN STYLE="text-decoration: none"><FONT FACE="Courier New, monospace">"changed_file".</FONT></SPAN></P> + full path of the last changed file and the action that triggered + the change notification (create, update or delete) are </FONT><SPAN STYLE="text-decoration: none"><FONT FACE="Tahoma, sans-serif">written + to the environment variables </FONT></SPAN><SPAN STYLE="text-decoration: none"><FONT FACE="Courier New, monospace">"change_path"</FONT></SPAN><SPAN STYLE="text-decoration: none"><FONT FACE="Tahoma, sans-serif"> + and </FONT></SPAN><SPAN STYLE="text-decoration: none"><FONT FACE="Courier New, monospace">"change_action".</FONT></SPAN></P> </UL> </SPAN><BR CLEAR=LEFT><BR> </P> @@ -121,9 +122,10 @@ directories. (Windows)</FONT></P> <P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Courier New, monospace"><FONT FACE="Tahoma, sans-serif">Show which file or directory has triggered a change. Enter command line:</FONT><BR> cmd /c echo - "%changed_file%" & pause<BR><BR><FONT FACE="Tahoma, sans-serif">Write + %change_action% "%change_path%" & pause<BR><BR><FONT FACE="Tahoma, sans-serif">Write a list of all changes to a logfile:</FONT><BR> cmd - /c echo "%changed_file%" >> c:\log.txt</FONT></P> + /c echo %change_action% "%change_path%" >> + c:\log.txt</FONT></P> </UL> </SPAN><BR CLEAR=LEFT> </P> diff --git a/BUILD/Languages/english_uk.lng b/BUILD/Languages/english_uk.lng index 840e9431..4d6a5611 100644 --- a/BUILD/Languages/english_uk.lng +++ b/BUILD/Languages/english_uk.lng @@ -355,10 +355,10 @@ The command is triggered if: <target>Synchronisation completed successfully!</target> <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source> -<target>Press "Switch" to resolve issues in FreeFileSync main dialog.</target> +<target>Press "Switch" to resolve issues in FreeFileSync main dialogue.</target> <source>Switching to FreeFileSync main dialog...</source> -<target>Switching to FreeFileSync main dialog...</target> +<target>Switching to FreeFileSync main dialogue...</target> <source>Unable to connect to sourceforge.net!</source> <target>Unable to connect to sourceforge.net!</target> @@ -424,7 +424,7 @@ The command is triggered if: <target>Drag && drop</target> <source>Close progress dialog</source> -<target>Close progress dialog</target> +<target>Close progress dialogue</target> <source>Standby</source> <target>Standby</target> @@ -574,7 +574,7 @@ The command is triggered if: <target>On completion:</target> <source>Show progress dialog</source> -<target>Show progress dialog</target> +<target>Show progress dialogue</target> <source>Generate log file</source> <target>Generate log file</target> @@ -772,7 +772,7 @@ Note: File names must be relative to base directories! <target>Transfer file and folder permissions (Requires Administrator rights)</target> <source>Restore hidden dialogs</source> -<target>Restore hidden dialogs</target> +<target>Restore hidden dialogues</target> <source>External applications</source> <target>External applications</target> @@ -787,7 +787,7 @@ Note: File names must be relative to base directories! <target>Statistics</target> <source>Don't show this dialog again</source> -<target>Don't show this dialog again</target> +<target>Don't show this dialogue again</target> <source>Find what:</source> <target>Find what:</target> @@ -1114,7 +1114,7 @@ Note: File names must be relative to base directories! <target>- Other side's counterpart to %dir</target> <source>Make hidden dialogs and warning messages visible again?</source> -<target>Make hidden dialogs and warning messages visible again?</target> +<target>Make hidden dialogues and warning messages visible again?</target> <source> <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform> diff --git a/BUILD/Languages/german.lng b/BUILD/Languages/german.lng index 10f19f6d..cdb0622f 100644 --- a/BUILD/Languages/german.lng +++ b/BUILD/Languages/german.lng @@ -351,6 +351,9 @@ Die Befehlszeile wird ausgelöst wenn: <source>Synchronization completed with errors!</source> <target>Synchronisation mit Fehlern abgeschlossen!</target> +<source>Synchronization completed with warnings!</source> +<target>Synchronisation mit Warnungen abgeschlossen!</target> + <source>Nothing to synchronize!</source> <target>Es gibt nichts zu synchronisieren!</target> @@ -444,18 +447,18 @@ Die Befehlszeile wird ausgelöst wenn: <source>Hibernate</source> <target>Ruhezustand</target> -<source>1. &Compare</source> -<target>1. &Vergleichen</target> - -<source>2. &Synchronize</source> -<target>2. &Synchronisieren</target> - <source>&New</source> <target>&Neu</target> <source>&Save</source> <target>&Speichern</target> +<source>1. &Compare</source> +<target>1. &Vergleichen</target> + +<source>2. &Synchronize</source> +<target>2. &Synchronisieren</target> + <source>&Language</source> <target>&Sprache</target> diff --git a/BUILD/Resources.zip b/BUILD/Resources.zip Binary files differindex 676a8d0d..1f602205 100644 --- a/BUILD/Resources.zip +++ b/BUILD/Resources.zip diff --git a/BUILD/Sync_Complete.wav b/BUILD/Sync_Complete.wav Binary files differindex 3fe95e5d..96dd2a15 100644 --- a/BUILD/Sync_Complete.wav +++ b/BUILD/Sync_Complete.wav |