summaryrefslogtreecommitdiff
path: root/BUILD
diff options
context:
space:
mode:
Diffstat (limited to 'BUILD')
-rw-r--r--BUILD/Changelog.txt22
-rw-r--r--BUILD/FreeFileSync.chmbin503768 -> 503908 bytes
-rw-r--r--BUILD/Help/html/advanced/Macros.html17
-rw-r--r--BUILD/Languages/german.lng14
-rw-r--r--BUILD/Resources.datbin333067 -> 333098 bytes
5 files changed, 39 insertions, 14 deletions
diff --git a/BUILD/Changelog.txt b/BUILD/Changelog.txt
index ca5e6c62..36999147 100644
--- a/BUILD/Changelog.txt
+++ b/BUILD/Changelog.txt
@@ -2,6 +2,28 @@
|FreeFileSync|
--------------
+Changelog v3.19
+---------------
+Exclude directories from synchronization which cannot be accessed during comparison
+Warning if Recycle Bin is not available instead of deleting silently
+Adapted log message if missing recycler leads to permanent deletion (Windows)
+Revert to per file recycle bin handling if creating temp recycler folder fails
+Avoid orphaned deletion temp directories on network drives
+Quick-select comparison and synchronization options via double-click
+New right-click dropdown menu on comparison and synchronization settings button
+New database design: copying the database file does not lead to complications anymore
+Full support for "retry" while comparing
+Don't copy empty folders when filtering by timespan
+Allow loading/merging multiple configurations files via file open dialog
+Allow loading/merging multiple configurations in last used config list
+Fixed system shutdown interruption during batch mode
+Allow saving log files in both silent and non-silent batch jobs
+Reduced main dialog flicker when switching configurations
+Database and lock files created by FreeFileSync do not trigger RealtimeSync anymore
+Restrict maximum number of visible folder pairs to 6 (configurable via GlobalSettings.xml)
+New macros: %day%, %hour%, %min%, %sec%
+
+
Changelog v3.18
---------------
Launcher running synchronously and returning application error code
diff --git a/BUILD/FreeFileSync.chm b/BUILD/FreeFileSync.chm
index 66e3a195..b5c6039c 100644
--- a/BUILD/FreeFileSync.chm
+++ b/BUILD/FreeFileSync.chm
Binary files differ
diff --git a/BUILD/Help/html/advanced/Macros.html b/BUILD/Help/html/advanced/Macros.html
index b8126555..a513f458 100644
--- a/BUILD/Help/html/advanced/Macros.html
+++ b/BUILD/Help/html/advanced/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="20110417;18595700">
+ <META NAME="CHANGED" CONTENT="20110718;14131000">
<META NAME="Info 1" CONTENT="">
<META NAME="Info 2" CONTENT="">
<META NAME="Info 3" CONTENT="">
@@ -39,12 +39,16 @@ macros:</B></FONT></P>
<P><SPAN ID="Rahmen4" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: none; padding: 0cm; background: #e6e6e6">
<UL>
<P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><FONT FACE="Courier New, monospace">%time%&nbsp;&nbsp;&nbsp;&nbsp;-
- </FONT>current time, format [hhmmss], e. g. &quot;<FONT FACE="Courier New, monospace">201340</FONT>&quot;<BR><FONT FACE="Courier New, monospace">%weekday%&nbsp;-
- </FONT>day of the week, e. g. &quot;<FONT FACE="Courier New, monospace">Monday</FONT>&quot;<BR><FONT FACE="Courier New, monospace">%date%&nbsp;&nbsp;&nbsp;&nbsp;-
- </FONT>current date, e. g. &quot;<FONT FACE="Courier New, monospace">2010-07-13</FONT>&quot;<BR><FONT FACE="Courier New, monospace">%week%&nbsp;&nbsp;&nbsp;&nbsp;-
- </FONT>calendar week, e. g. &quot;<FONT FACE="Courier New, monospace">28</FONT>&quot;<BR><FONT FACE="Courier New, monospace">%month%&nbsp;&nbsp;&nbsp;-
+ </FONT>current time, format [hhmmss], e. g. &quot;<FONT FACE="Courier New, monospace">201340</FONT>&quot;<BR><FONT FACE="Courier New, monospace">%date%&nbsp;&nbsp;&nbsp;&nbsp;-
+ </FONT>current date, e. g. &quot;<FONT FACE="Courier New, monospace">2010-07-13</FONT>&quot;<BR><BR><FONT FACE="Courier New, monospace">%weekday%&nbsp;-
+ </FONT>day of the week, e. g. &quot;<FONT FACE="Courier New, monospace">Monday</FONT>&quot;<BR><FONT FACE="Courier New, monospace">%week%&nbsp;&nbsp;&nbsp;&nbsp;-
+ </FONT>calendar week, e. g. &quot;<FONT FACE="Courier New, monospace">28</FONT>&quot;<BR><BR><FONT FACE="Courier New, monospace">%day%&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-
+ </FONT>current day, e. g. &quot;<FONT FACE="Courier New, monospace">21</FONT>&quot;<BR><FONT FACE="Courier New, monospace">%month%&nbsp;&nbsp;&nbsp;-
</FONT>current month, e. g. &quot;<FONT FACE="Courier New, monospace">July</FONT>&quot;<BR><FONT FACE="Courier New, monospace">%year%&nbsp;&nbsp;&nbsp;&nbsp;-
- </FONT>current year, e. g. &quot;<FONT FACE="Courier New, monospace">2010</FONT>&quot;</FONT></P>
+ </FONT>current year, e. g. &quot;<FONT FACE="Courier New, monospace">2010</FONT>&quot;<BR><BR><FONT FACE="Courier New, monospace">%hour%&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-
+ </FONT>current hour, e. g. &quot;<FONT FACE="Courier New, monospace">20</FONT>&quot;<BR><FONT FACE="Courier New, monospace">%min%&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-
+ </FONT>current minute, e. g. &quot;<FONT FACE="Courier New, monospace">13</FONT>&quot;<BR><FONT FACE="Courier New, monospace">%sec%&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-
+ </FONT>current second, e. g. &quot;<FONT FACE="Courier New, monospace">40</FONT>&quot;</FONT></P>
</UL>
</SPAN><BR CLEAR=LEFT>
</P>
@@ -65,7 +69,6 @@ add a great amount of flexibility to Batch Synchronization
<LI><P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm">
<FONT FACE="Tahoma, sans-serif"><FONT FACE="Courier New, monospace">C:\Backup\%username%_Config&nbsp;</FONT>expands
to<FONT FACE="Courier New, monospace"><BR>C:\Backup\ZenJu_Config</FONT></FONT></P>
- <P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"></P>
<LI><P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm">
<FONT FACE="Tahoma, sans-serif"><FONT FACE="Courier New, monospace">%appdata%\FreeFileSync&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</FONT>expands
to<FONT FACE="Courier New, monospace"><BR>C:\Documents and
diff --git a/BUILD/Languages/german.lng b/BUILD/Languages/german.lng
index fa8031f9..b9e4ffe2 100644
--- a/BUILD/Languages/german.lng
+++ b/BUILD/Languages/german.lng
@@ -109,10 +109,10 @@
<target>Erstmalige Synchronisation:</target>
<source>One of the FreeFileSync database files is not yet existing:</source>
<target>Eine der FreeFileSync Datenbankdateien existiert noch nicht:</target>
-<source>One of the FreeFileSync database entries within the following file is not yet existing:</source>
-<target>Einer der FreeFileSync Datenbankeinträge innerhalb der folgenden Datei existiert noch nicht:</target>
<source>Error reading from synchronization database:</source>
<target>Fehler beim Lesen der Synchronisationsdatenbank:</target>
+<source>No matching synchronization session found in database files:</source>
+<target></target>
<source>An exception occurred!</source>
<target>Eine Ausnahme ist aufgetreten!</target>
<source>Error deleting file:</source>
@@ -134,7 +134,7 @@
<source>Info</source>
<target>Info</target>
<source>Fatal Error</source>
-<target>Fataler Fehler</target>
+<target>Schwerer Fehler</target>
<source>Invalid FreeFileSync config file!</source>
<target>Ungültige FreeFileSync Konfigurationsdatei!</target>
<source>File does not exist:</source>
@@ -695,10 +695,6 @@ Transfer file and directory permissions
<target>Verzeichnispaare</target>
<source>Select view</source>
<target>Ansicht auswählen</target>
-<source>Folder Comparison and Synchronization</source>
-<target>Verzeichnisvergleich und Synchronisation</target>
-<source>Recycle Bin not yet supported for this system!</source>
-<target>Der Papierkorb wird für dieses System noch nicht unterstützt!</target>
<source>Set direction:</source>
<target>Setze Richtung:</target>
<source>Exclude temporarily</source>
@@ -733,6 +729,8 @@ Transfer file and directory permissions
<target>Änderungen der aktuellen Konfiguration sichern?</target>
<source>Configuration loaded!</source>
<target>Konfiguration geladen!</target>
+<source>Folder Comparison and Synchronization</source>
+<target>Verzeichnisvergleich und Synchronisation</target>
<source>Hide files that exist on left side only</source>
<target>Nur links existierende Dateien ausblenden</target>
<source>Show files that exist on left side only</source>
@@ -1043,6 +1041,8 @@ Transfer file and directory permissions
<target>Benötigter freier Speicherplatz:</target>
<source>Free disk space available:</source>
<target>Verfügbarer freier Speicherplatz:</target>
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target></target>
<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
<target>Es wird ein Verzeichnis verändert werden, das Teil mehrerer Verzeichnispaare ist! Bitte die Synchronisationseinstellungen prüfen!</target>
<source>Processing folder pair:</source>
diff --git a/BUILD/Resources.dat b/BUILD/Resources.dat
index 6af47f50..a88b0703 100644
--- a/BUILD/Resources.dat
+++ b/BUILD/Resources.dat
Binary files differ
bgstack15