3.1

19 files changed, 65 insertions, 55 deletions

diff --git a/BUILD/Changelog.txt b/BUILD/Changelog.txt
index 391fc306..25e4e56b 100644
--- a/BUILD/Changelog.txt
+++ b/BUILD/Changelog.txt
@@ -2,6 +2,15 @@
 |FreeFileSync|
 --------------
 
+Changelog v3.1
+--------------
+Support for multiple datasources in Automatic mode
+Copy file and folder create/access/modification times when synchronizing
+Progress dialog can be minimized to systray (Batch and GUI mode)
+Allow switching between silent/non-silent batch mode interactively
+Some GUI improvements
+
+
 Changelog v3.0
 --------------
 New synchronization mode: <Automatic>
diff --git a/BUILD/Languages/chinese_simple.lng b/BUILD/Languages/chinese_simple.lng
index 6f41da3c..9b8ed25f 100644
--- a/BUILD/Languages/chinese_simple.lng
+++ b/BUILD/Languages/chinese_simple.lng
@@ -562,8 +562,8 @@ Info
 信息
 Information
 信息
-Initial synchronization. Please verify default copy-directions!
-初始化同步. 请校对默认的复制方向!
+Initial synchronization.
+初始化同步.
 Integrate external applications into context menu. The following macros are available:
 集成外部应用程序到右键菜单. 如下宏可用:
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
diff --git a/BUILD/Languages/chinese_traditional.lng b/BUILD/Languages/chinese_traditional.lng
index a84ca562..9ff6db11 100644
--- a/BUILD/Languages/chinese_traditional.lng
+++ b/BUILD/Languages/chinese_traditional.lng
@@ -562,8 +562,8 @@ Info
 訊息
 Information
 訊息
-Initial synchronization. Please verify default copy-directions!
-初始化同步。請驗證預設的複製方向！
+Initial synchronization.
+初始化同步。
 Integrate external applications into context menu. The following macros are available:
 整合上下文功能表中的外部應用程式。可以使用下面的巨集：
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
diff --git a/BUILD/Languages/czech.lng b/BUILD/Languages/czech.lng
index 1129d5c6..9309965b 100644
--- a/BUILD/Languages/czech.lng
+++ b/BUILD/Languages/czech.lng
@@ -562,8 +562,8 @@ Info
 Info
 Information
 Informace
-Initial synchronization. Please verify default copy-directions!
-Prvotní synchronizace. Prosím ověřte základní nastavení směru synchronizace!
+Initial synchronization.
+Prvotní synchronizace.
 Integrate external applications into context menu. The following macros are available:
 Integrace externí aplikace do kontextového menu. K dispozici jsou následující makra:
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
diff --git a/BUILD/Languages/dutch.lng b/BUILD/Languages/dutch.lng
index 2387b089..bb19613a 100644
--- a/BUILD/Languages/dutch.lng
+++ b/BUILD/Languages/dutch.lng
@@ -560,8 +560,8 @@ Info
 Info
 Information
 Informatie
-Initial synchronization. Please verify default copy-directions!
-Initiële  synchronisatie. Verifieer alstublieft de standaard kopieer-richtingen!
+Initial synchronization.
+Initiële  synchronisatie.
 Integrate external applications into context menu. The following macros are available:
 Integreer externe applicaties in het context menu. De volgende macros zijn beschikbaar:
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
diff --git a/BUILD/Languages/french.lng b/BUILD/Languages/french.lng
index 76216760..52642e59 100644
--- a/BUILD/Languages/french.lng
+++ b/BUILD/Languages/french.lng
@@ -560,8 +560,8 @@ Info
 Info
 Information
 Information
-Initial synchronization. Please verify default copy-directions!
-Première synchronisation. Veuillez vérifier le sens de la copie par défaut !
+Initial synchronization.
+Première synchronisation.
 Integrate external applications into context menu. The following macros are available:
 Inclure les applications externes dans le menu contextuel. Les macros suivantes sont disponibles :
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
diff --git a/BUILD/Languages/german.lng b/BUILD/Languages/german.lng
index 23de4e2d..c94c1d8c 100644
--- a/BUILD/Languages/german.lng
+++ b/BUILD/Languages/german.lng
@@ -562,8 +562,8 @@ Info
 Info
 Information
 Information
-Initial synchronization. Please verify default copy-directions!
-Erstmalige Synchronisation. Bitte die gesetzten Kopierrichtungen überprüfen!
+Initial synchronization.
+Erstmalige Synchronisation.
 Integrate external applications into context menu. The following macros are available:
 Integriert externe Anwendungen in das Kontextmenu. Die folgenden Makros stehen zur Verfügung:
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
@@ -815,7 +815,7 @@ Benutzerdefiniertes Verzeichnis
 User-defined directory for deletion was not specified!
 Kein benutzerdefiniertes Verzeichnis zum Löschen angegeben!
 Using default synchronization directions. Please recheck.
-Benutze die Standard-Synchronisationsrichtungen. Bitte überprüfen.
+Die Standard-Synchronisationsrichtungen wurden gesetzt. Bitte überprüfen.
 Variant
 Variante
 Verifying file %x
diff --git a/BUILD/Languages/hungarian.lng b/BUILD/Languages/hungarian.lng
index 63c502fb..2fd4dfa1 100644
--- a/BUILD/Languages/hungarian.lng
+++ b/BUILD/Languages/hungarian.lng
@@ -139,7 +139,7 @@ A(z) %x nem megfelelő FreeFileSync kötegelt feladat fájl!
 3. Exclude files directly on main grid via context menu.
 3. Fájlok közvetlen kizárása a fő listából helyi menü segítségével.
 <Automatic>
-
+<Automatikus>
 <Directory>
 <Mappa>
 <Last session>
@@ -171,7 +171,7 @@ Egy kötegelt feladat fájl létrehozása az automatizált szinkronizációhoz.
 Auto-adjust columns
 Oszlopok automatikus igazítása
 Automatic mode
-
+Automatikus mód
 Batch execution
 Kötegelt végrehajtás
 Batch file created successfully!
@@ -181,7 +181,7 @@ Kötegelt feladat
 Big thanks for localizing FreeFileSync goes out to:
 Nagy köszönet a FreeFileSync lokalizációjáért\na következő személyeknek:
 Both sides have changed since last synchronization!
-
+Mindkét oldal megváltozott az utolsó szikronizálás óta!
 Browse
 Tallózás
 Build:
@@ -189,11 +189,11 @@ Build:
 Cancel
 Mégsem
 Cannot determine sync-direction: Changed filter settings!
-
+Nem lehet meghatározni a szinkronizáció irányát: A szűrőbeállítások megváltoztak!
 Cannot determine sync-direction: No change since last synchronization!
-
+Nem lehet meghatározni a szinkronizáció irányát: Nem volt változás az utolsó szinkronizáció óta!
 Category
-
+Kategória
 Change direction
 Irány megváltoztatása
 Check all
@@ -389,7 +389,7 @@ A fájl attribútumainak olvasása sikertelen:
 Error reading file:
 A fájl olvasása sikertelen:
 Error reading from synchronization database:
-
+Hiba történt a szinkronizációs adatbázis olvasása közben:
 Error resolving symbolic link:
 A szimbolikus link feloldása sikertelen:
 Error starting Volume Shadow Copy Service!
@@ -403,9 +403,7 @@ A fájl attribútumainak írása sikertelen:
 Error writing file:
 A fájl írása sikertelen:
 Error writing to synchronization database:
-
-Source directory does not exist anymore:
-A forrásként megadott mappa többé nem létezik:
+Hiba történt a szinkronizációs adatbázis írása közben:
 Example
 Példa
 Exclude
@@ -455,7 +453,7 @@ Mindkét oldalon létező fájlok, de a bal oldali újabb
 Files that exist on both sides, right one is newer
 Mindkét oldalon létező fájlok, de a jobb oldali újabb
 Files/folders found:
-
+Talált fájlok/mappák:
 Files/folders remaining:
 Hátralévő fájlok/mappák:
 Files/folders that exist on left side only
@@ -489,7 +487,7 @@ A FreeFileSync naprakész!
 Full path
 Teljes elérési útvonal
 Generating database...
-
+Adatbázis generálása...
 Generating file list...
 Fájllista generálása...
 Global settings
@@ -555,13 +553,13 @@ Ideiglenesen tartalmaz
 Include: *.doc;*.zip;*.exe\nExclude: temp\\*
 Csatol: *.doc;*.zip;*.exe\nKizár: temp\\*
 Incompatible synchronization database format:
-
+Inkompatibilis szinkronizációs adatbázis formátum:
 Info
 Információ
 Information
 Információ
-Initial synchronization. Please verify default copy-directions!
-
+Initial synchronization.
+Első szinkronizáció.
 Integrate external applications into context menu. The following macros are available:
 Külső alkalmazás integrálása a helyi menübe. Az elérhető makrók a következők:
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
@@ -601,7 +599,7 @@ Moving folder %x to user-defined directory %y
 Multiple...
 Sokszorosítás
 No database file existing yet:
-
+Nem létező adatbázis fájl:
 Not enough free disk space available in:
 Nincs elég szabad lemezterület:
 Nothing to synchronize according to configuration!
@@ -617,11 +615,11 @@ OK
 Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the base synchronization directories.
 Csak a szűrésnek megfelelő fájlok/mappák lesznek kijelölve szinkronizáláshoz. A szűrő a szinkronizálás alap mappáihoz relatív fájl- és mappanevekre lesz alkalmazva.
 Open directly
-
+Megnyitás közvetlenül
 Open with Explorer
-
+Megnyitás Explorerrel
 Open with Konqueror
-
+Megnyitás Konquerorral
 Operation aborted!
 Művelet megszakítva!
 Operation:
@@ -730,6 +728,8 @@ Size
 Méret
 Source code written completely in C++ utilizing:
 A forráskód teljes egészében C++-ban íródott\na következők felhasználásával:
+Source directory does not exist anymore:
+A forrásként megadott mappa többé nem létezik:
 Speed:
 Sebesség:
 Start
@@ -759,7 +759,7 @@ Minden .doc, .zip és .exe fájl szinkronizálása a \"temp\" almappában talál
 Synchronize both sides simultaneously: Copy new or updated files in both directions.
 Mindkét oldal szinkronizálása egyszerre: Új és frissített fájlok másolása mindkét irányban.
 Synchronize both sides using a database. Deletions are detected automatically.
-
+Mindkét oldal szinkronizálása adatbázis segítségével. A törlések automatikusan felismerődnek.
 Synchronize...
 Szinkronizálás
 Synchronizing...
@@ -813,7 +813,7 @@ Felhasználó által megadott mappa
 User-defined directory for deletion was not specified!
 A törléshez nem lett mappa megadva a felhasználó által!
 Using default synchronization directions. Please recheck.
-
+Az alapértelmezett szinkronizációs irányok vannak használatban. Kérjük, ellenőrizze újra.
 Variant
 Variáns
 Verifying file %x
@@ -829,7 +829,7 @@ Ha az összehasonlítás ezekkel a beállításokkal lesz elindítva, akkor a k�
 You can ignore the error to consider not existing directories as empty.
 Figyelmen kívül hagyhatja a hibákat a nem létező mappákat üresnek tekintve.
 You can ignore the error to skip current folder pair.
-
+Figyelmen kívül hagyhatja a hibát az aktuális mappapár átugrásához.
 You may try to synchronize remaining items again (WITHOUT having to re-compare)!
 Meg lehet próbálni újra a megmaradt elemek szinkronizálását (az összehasonlítás újbóli elvégzése NÉLKÜL)!
 different
diff --git a/BUILD/Languages/italian.lng b/BUILD/Languages/italian.lng
index 98ebdd4a..f5134536 100644
--- a/BUILD/Languages/italian.lng
+++ b/BUILD/Languages/italian.lng
@@ -560,8 +560,8 @@ Info
 Info
 Information
 Informazioni
-Initial synchronization. Please verify default copy-directions!
-Prima sincronizzazione. Verifica il default per le direzioni di copia!
+Initial synchronization.
+Prima sincronizzazione.
 Integrate external applications into context menu. The following macros are available:
 Integra applicazioni esterne nel menu contestuale. Sono disponibili le seguenti macro:
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
diff --git a/BUILD/Languages/japanese.lng b/BUILD/Languages/japanese.lng
index 11532097..27354764 100644
--- a/BUILD/Languages/japanese.lng
+++ b/BUILD/Languages/japanese.lng
@@ -562,8 +562,8 @@ Info
 情報
 Information
 インフォメーション
-Initial synchronization. Please verify default copy-directions!
-同期処理の初期化.. デフォルトのコピー方向を再度確認してください!
+Initial synchronization.
+同期処理の初期化.
 Integrate external applications into context menu. The following macros are available:
 外部のアプリケーションをコンテキストメニューに統合、以下のマクロが利用できます:
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
diff --git a/BUILD/Languages/polish.lng b/BUILD/Languages/polish.lng
index 65ac1a5b..25dd8523 100644
--- a/BUILD/Languages/polish.lng
+++ b/BUILD/Languages/polish.lng
@@ -562,8 +562,8 @@ Info
 Info
 Information
 Informacja
-Initial synchronization. Please verify default copy-directions!
-Wstępna synchronizacja. Sprawdź domyślne kierunki synchronizacji!
+Initial synchronization.
+Wstępna synchronizacja.
 Integrate external applications into context menu. The following macros are available:
 Dołącz zewnętrzną aplikację do menu kontekstowego. Dostępne macra:
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
diff --git a/BUILD/Languages/portuguese.lng b/BUILD/Languages/portuguese.lng
index c36fd259..31d75a02 100644
--- a/BUILD/Languages/portuguese.lng
+++ b/BUILD/Languages/portuguese.lng
@@ -562,8 +562,8 @@ Info
 Info
 Information
 Informação
-Initial synchronization. Please verify default copy-directions!
-Sincronização inicial. Verifique as direcções de cópia iniciais!
+Initial synchronization.
+Sincronização inicial.
 Integrate external applications into context menu. The following macros are available:
 Integrar aplicações externas no menu de contexto. As seguintes macros estão disponíveis:
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
diff --git a/BUILD/Languages/portuguese_br.lng b/BUILD/Languages/portuguese_br.lng
index 99d6d708..c2be1885 100644
--- a/BUILD/Languages/portuguese_br.lng
+++ b/BUILD/Languages/portuguese_br.lng
@@ -560,8 +560,8 @@ Info
 Info
 Information
 Informação
-Initial synchronization. Please verify default copy-directions!
-Sincronização inicial. Por favor, verifique a direção de cópia padrão!
+Initial synchronization.
+Sincronização inicial.
 Integrate external applications into context menu. The following macros are available:
 Integrar aplicações externas no menu de contexto. As seguintes macros estão disponíveis:
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
diff --git a/BUILD/Languages/romanian.lng b/BUILD/Languages/romanian.lng
index 1e0626a5..ee155870 100644
--- a/BUILD/Languages/romanian.lng
+++ b/BUILD/Languages/romanian.lng
@@ -562,8 +562,8 @@ Info
 Info
 Information
 Informații
-Initial synchronization. Please verify default copy-directions!
-Sincronizare inițială. Verificați sensurile de copiere implicite!
+Initial synchronization.
+Sincronizare inițială.
 Integrate external applications into context menu. The following macros are available:
 Include aplicațiile externe în meniul contextual. Sînt disponibile următoarele macrocomenzi:
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
diff --git a/BUILD/Languages/russian.lng b/BUILD/Languages/russian.lng
index f050ab36..963e388c 100644
--- a/BUILD/Languages/russian.lng
+++ b/BUILD/Languages/russian.lng
@@ -562,8 +562,8 @@ Info
 Информация
 Information
 Информация
-Initial synchronization. Please verify default copy-directions!
-Первоначальная синхронизация. Пожалуйста, проверьте направление копирования!
+Initial synchronization.
+Первоначальная синхронизация.
 Integrate external applications into context menu. The following macros are available:
 Интегрирует внешние приложения в контекстное меню.\nСледующие команды доступны:
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
diff --git a/BUILD/Languages/slovenian.lng b/BUILD/Languages/slovenian.lng
index cf60cd2d..b84087c7 100644
--- a/BUILD/Languages/slovenian.lng
+++ b/BUILD/Languages/slovenian.lng
@@ -562,8 +562,8 @@ Info
 Info
 Information
 Informacije
-Initial synchronization. Please verify default copy-directions!
-Začetna sinhronizacija. Prosimo preverite privzete smeri kopiranja!
+Initial synchronization.
+Začetna sinhronizacija.
 Integrate external applications into context menu. The following macros are available:
 Integriraj zunanje aplikacije v kontekstni menu. Na voljo so naslednji makri:
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
diff --git a/BUILD/Languages/turkish.lng b/BUILD/Languages/turkish.lng
index 2e0c1ff2..a171483a 100644
--- a/BUILD/Languages/turkish.lng
+++ b/BUILD/Languages/turkish.lng
@@ -558,8 +558,8 @@ Info
 Bilgi
 Information
 Bilgi
-Initial synchronization. Please verify default copy-directions!
-Baþlangýç senkronizasyonu. Lütfen ön tanýmlý kopyalama yönlerini doðrulayýnýz! 
+Initial synchronization.
+Baþlangýç senkronizasyonu.
 Integrate external applications into context menu. The following macros are available:
 Harici uygulamaları içerik menüsüne ekle. Şu makro’lar temin edilebilir:
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
diff --git a/BUILD/Readme.txt b/BUILD/Readme.txt
index f39bbb48..0f2ae840 100644
--- a/BUILD/Readme.txt
+++ b/BUILD/Readme.txt
@@ -1,4 +1,4 @@
-FreeFileSync v3.0
+FreeFileSync v3.1
 -----------------
 
 ---------
@@ -17,7 +17,7 @@ FreeFileSync v3.0
 2. No limitations: An arbitrary number of files can be synchronized.
 3. Unicode support.
 4. Network support.
-5. Synchronization database for automated setting of sync-directions
+5. Synchronization database for automated setting of sync-directions and conflict detection
 6. Support for multiple folder pairs with distinct configuration
 7. Full support for Windows/Linux Symbolic Links and Windows Junction Points.
 8. Lean & easily accessible UI: Highly optimized for speed and huge sets of data.
@@ -54,6 +54,7 @@ FreeFileSync v3.0
 28. Copy locked files using Windows Volume Shadow Copy. (Windows only)
 29. Load file icons asynchronously for maximum display performance.
 30. Create regular backups with macros %time%, %date% within directory names
+31. Copy file and folder create/access/modification times when synchronizing
 
 
 
diff --git a/BUILD/Resources.dat b/BUILD/Resources.dat
index 55072595..1273a576 100644
--- a/BUILD/Resources.dat
+++ b/BUILD/Resources.dat