5.19

9 files changed, 1094 insertions, 693 deletions

diff --git a/BUILD/Languages/arabic.lng b/BUILD/Languages/arabic.lng
index 8d84a0b1..4d5bf07b 100644
--- a/BUILD/Languages/arabic.lng
+++ b/BUILD/Languages/arabic.lng
@@ -250,8 +250,8 @@
 <target>الفحص:</target>
 
 <source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </source>
 <target>
 <pluralform>0 بند</pluralform>
diff --git a/BUILD/Languages/croatian.lng b/BUILD/Languages/croatian.lng
index b87ebc76..8407fe7f 100644
--- a/BUILD/Languages/croatian.lng
+++ b/BUILD/Languages/croatian.lng
@@ -1,84 +1,12 @@
 <header>
 	<language>Hrvatski</language>
-	<translator>Slavko Blažević</translator>
+	<translator>Miroslav Vranić</translator>
 	<locale>hr_HR</locale>
 	<flag_image>flag_croatia.png</flag_image>
 	<plural_form_count>3</plural_form_count>
 	<plural_definition>n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2</plural_definition>
 </header>
 
-<source>Cannot determine final path for %x.</source>
-<target></target>
-
-<source>Failed to register to receive system messages.</source>
-<target></target>
-
-<source>Cannot create symbolic link %x.</source>
-<target></target>
-
-<source>
-<pluralform>Do you really want to delete the following item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target></target>
-
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target></target>
-
-<source>Do&n't save</source>
-<target></target>
-
-<source>
-<pluralform>%y of 1 row in view</pluralform>
-<pluralform>%y of %x rows in view</pluralform>
-</source>
-<target></target>
-
-<source>Select a variant</source>
-<target></target>
-
-<source>Check for new &version</source>
-<target></target>
-
-<source>&Tools</source>
-<target></target>
-
-<source>Cannot find current FreeFileSync version number online. Do you want to check manually?</source>
-<target></target>
-
-<source>&Download</source>
-<target></target>
-
-<source>New version found</source>
-<target></target>
-
-<source>Switching to FreeFileSync main dialog</source>
-<target></target>
-
-<source>Data verification error: %x and %y have different content.</source>
-<target></target>
-
-<source>Cannot determine volume name for %x.</source>
-<target></target>
-
-<source>Starting comparison</source>
-<target></target>
-
-<source>Resolving symbolic link %x</source>
-<target></target>
-
-<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source>
-<target></target>
-
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target></target>
-
-<source>The database entry is not in sync considering current settings.</source>
-<target></target>
-
 <source>Both sides have changed since last synchronization.</source>
 <target>Obje su strane promjenjene od posljednje sinkronizacije.</target>
 
@@ -88,6 +16,9 @@
 <source>No change since last synchronization.</source>
 <target>Nema promjena od zadnje sinkronizacije.</target>
 
+<source>The database entry is not in sync considering current settings.</source>
+<target>Unos podataka nije u sinkronizaciji uzevši u obzir trenutne postavke.</target>
+
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Postavljam zadani sinkronizacijski smijer: Stare datoteke će biti prepisane novim datotekama.</target>
 
@@ -112,11 +43,20 @@
 <source>Deleting symbolic link %x</source>
 <target>Brisanje simboličnih poveznica %x</target>
 
+<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>Koš nije dostupan za sljedeće mape. Datoteke će biti nepovratno izbrisane:</target>
+
 <source>An exception occurred</source>
 <target>Dogodilo se izuzeće</target>
 
-<source>Cannot find file %x.</source>
-<target>Ne mogu pronaći datoteku %x.</target>
+<source>A directory path is expected after %x.</source>
+<target>Putanja direktorija se očekuje nakon %x.</target>
+
+<source>Syntax error</source>
+<target>Greška sintakse</target>
+
+<source>Cannot open file %x.</source>
+<target>Ne mogu otvoriti datoteku %x.</target>
 
 <source>Error</source>
 <target>Greška</target>
@@ -124,6 +64,36 @@
 <source>File %x does not contain a valid configuration.</source>
 <target>Datoteka %x ne sadrži valjanu konfiguraciju</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>Neravnomjeran broj lijevih i desnih direkotrija specificiran.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>Config datoteka ne smije sadržavati postavke na direktorij par razini ukoliko su direktoriji upisani preko naredbene linije.</target>
+
+<source>Warning</source>
+<target>Oprez</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>Direkotrij nemože biti postavljen za više od jedne konfigracijske datoteke.</target>
+
+<source>Syntax:</source>
+<target>Sintaksa:</target>
+
+<source>config files</source>
+<target>config datoteke</target>
+
+<source>directory</source>
+<target>direktorij</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>Bilo koji broj FreeFileSync . ffs_gui i/ili .ffs_batch konfiguracijskih datoteka.</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>Bilo koji broj alternativnih mapa za najviše jedanu config datoteku.</target>
+
+<source>Command line</source>
+<target>Naredbena linija</target>
+
 <source>A folder input field is empty.</source>
 <target>Polje za odabir foldera je prazno.</target>
 
@@ -136,6 +106,9 @@
 <source>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
 <target>Možete ignorirati ovu pogrešku te uzeti u obzir svaku mapu praznom. Mape se tada stvaraju automatski tokom sinkronizacije.</target>
 
+<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source>
+<target>Sljedeće mape imaju zavisnu putanju. Budite pažljivi prilikom postavljanja pravila za sinkronizaciju:</target>
+
 <source>File %x has an invalid date.</source>
 <target>Datoteka %x ima nevaljan datum.</target>
 
@@ -151,12 +124,18 @@
 <source>Items differ in attributes only</source>
 <target>Stavke se razlikuju samo u atributima</target>
 
+<source>Resolving symbolic link %x</source>
+<target>Rješavam simboličku vezu %x</target>
+
 <source>Comparing content of files %x</source>
 <target>Uspoređujem sadržaj datoteka %x</target>
 
 <source>Generating file list...</source>
 <target>Generiram listu datoteka...</target>
 
+<source>Starting comparison</source>
+<target>Počinjem usporedbu</target>
+
 <source>Calculating sync directions...</source>
 <target>Izračunavam smjerove sinkronizacije...</target>
 
@@ -236,7 +215,7 @@
 <target>Ne mogu čitati datoteku %x.</target>
 
 <source>Database files do not share a common session.</source>
-<target>Datoteke baze ne dijele zajednički protokol</target>
+<target>Datoteke baze ne dijele zajednički protokol.</target>
 
 <source>Searching for folder %x...</source>
 <target>Tražim mapu %x...</target>
@@ -245,7 +224,7 @@
 <target>Ne mogu pročitati osobine od %x.</target>
 
 <source>Cannot get process information.</source>
-<target>Ne mogu dobit iniformacije o procesu</target>
+<target>Ne mogu dobit informacije o procesu</target>
 
 <source>Waiting while directory is locked (%x)...</source>
 <target>Čekam dok se direktorij zaključava (%x)...</target>
@@ -273,13 +252,13 @@
 <target>Ukupno vrijeme:</target>
 
 <source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </source>
 <target>
-<pluralform>%x Bajt</pluralform>
-<pluralform>%x Bajta</pluralform>
-<pluralform>%x Bajtova</pluralform>
+<pluralform>%x bajt</pluralform>
+<pluralform>%x bajta</pluralform>
+<pluralform>%x bajtova</pluralform>
 </target>
 
 <source>%x MB</source>
@@ -301,13 +280,13 @@
 <target>Pretražujem:</target>
 
 <source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </source>
 <target>
-<pluralform>%x Stavka</pluralform>
-<pluralform>%x Stavke</pluralform>
-<pluralform>%x Stavki</pluralform>
+<pluralform>%x nit</pluralform>
+<pluralform>%x niti</pluralform>
+<pluralform>%x niti</pluralform>
 </target>
 
 <source>Encoding extended time information: %x</source>
@@ -316,6 +295,9 @@
 <source>/sec</source>
 <target>/sek</target>
 
+<source>%x items</source>
+<target>%x stavke</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>Datoteka postavki %x učitana samo djelomično</target>
 
@@ -337,8 +319,11 @@
 <source>Cannot load file %x.</source>
 <target>Ne mogu učitati datoteku %x.</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>Naziv particije %x dio naziva datoteke %y.</target>
+<source>Cannot determine volume name for %x.</source>
+<target>Ne mogu ustanoviti ime volumen for %x.</target>
+
+<source>Volume name %x is not part of file path %y.</source>
+<target>Ime voumena %x nije dio puta datotke %y.</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Prekid zahtjevan: čekam da se trenutna akcija završi...</target>
@@ -406,9 +391,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>Vrijeme čekanja između zadnje prepoznate promjene i izvršenja naredbe</target>
 
-<source>Command line</source>
-<target>Naredbena linija</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -432,9 +414,6 @@ Naredba će biti pokrenuta ako se:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatska Sinkronizacija</target>
 
-<source>Warning</source>
-<target>Oprez</target>
-
 <source>Build: %x</source>
 <target>Inačnica: %x</target>
 
@@ -444,15 +423,21 @@ Naredba će biti pokrenuta ako se:
 <source>All files</source>
 <target>Sve datoteke</target>
 
+<source>Directory monitoring active</source>
+<target>Nadzor direktorija je aktivan</target>
+
+<source>Waiting until all directories are available...</source>
+<target>Čekanje na dostupnost svih direktorija...</target>
+
 <source>&Restore</source>
 <target>&Vrati</target>
 
+<source>&Show error</source>
+<target>&Prikaži grešku</target>
+
 <source>&Exit</source>
 <target>&Izlaz</target>
 
-<source>Waiting for missing directories...</source>
-<target>Čekam nedostajuće direktorije...</target>
-
 <source>Invalid command line:</source>
 <target>Netočna naredba:</target>
 
@@ -462,14 +447,14 @@ Naredba će biti pokrenuta ako se:
 <source>File time and size</source>
 <target>Vrijeme i veličina datoteke</target>
 
-<source> Two way </source>
+<source>Two way</source>
 <target>Dvosmjerno</target>
 
 <source>Mirror</source>
-<target>Zrcalno </target>
+<target>Zrcalno</target>
 
 <source>Update</source>
-<target>Ažuriraj </target>
+<target>Ažuriraj</target>
 
 <source>Custom</source>
 <target>Uobičajeno</target>
@@ -514,22 +499,19 @@ Naredba će biti pokrenuta ako se:
 <target>Odredišna mapa %x već postoji.</target>
 
 <source>Target folder input field must not be empty.</source>
-<target>Odredišna mapa ne može biti prazna</target>
+<target>Odredišna mapa ne može biti prazna.</target>
 
 <source>Folder input field for versioning must not be empty.</source>
-<target>Mapa unosa ne smije biti prazan</target>
+<target>Mapa unosa ne smije biti prazna.</target>
 
 <source>Source folder %x not found.</source>
-<target>Izvorna mapa %x nije pronađena</target>
+<target>Izvorna mapa %x nije pronađena.</target>
 
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>Slijedeće stavke imaju nedefiniranih sukoba te neće biti sinkronizirane:</target>
 
-<source>Significant difference detected:</source>
-<target>Značajna razlika opažena:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>Više od 50% od ukupnog broja datoteka će biti kopirano ili izbrisano.</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>Navedene mape se značajno razlikuju. Prvojerite dali uspoređujete ispravne mape za sinkronizaciju.</target>
 
 <source>Not enough free disk space available in:</source>
 <target>Nedovoljno prostora na disku:</target>
@@ -552,6 +534,9 @@ Naredba će biti pokrenuta ako se:
 <source>Creating Volume Shadow Copy for %x...</source>
 <target>Izrađujem Volume Shadow Kopiju za %x...</target>
 
+<source>Data verification error: %x and %y have different content.</source>
+<target>Greška pri provjeri podataka: %x i %y imaju različit sadržaj.</target>
+
 <source>Synchronization aborted</source>
 <target>Sinkronizacija prekinuta</target>
 
@@ -573,12 +558,24 @@ Naredba će biti pokrenuta ako se:
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
 <target>Preisni "Zamjeni" za riješavanje problema u FreeFileSync glavnom dijaloškom okviru</target>
 
+<source>Switching to FreeFileSync main dialog</source>
+<target>Prebacujem na FreeFileSync glavni dijaloški prozor</target>
+
+<source>Retrying operation after error:</source>
+<target>Ponavljam operaciju nakon greške:</target>
+
 <source>A new version of FreeFileSync is available:</source>
 <target>Nova verzija FreeFileSync je dostupna:</target>
 
 <source>Download now?</source>
 <target>Preuzeti sada?</target>
 
+<source>New version found</source>
+<target>Nova verzija je nađena</target>
+
+<source>&Download</source>
+<target>&Preuzmi</target>
+
 <source>FreeFileSync is up to date.</source>
 <target>FreeFileSync je ažuriran.</target>
 
@@ -588,6 +585,9 @@ Naredba će biti pokrenuta ako se:
 <source>Unable to connect to sourceforge.net.</source>
 <target>Ne mogu se povezati na sourceforge.net.</target>
 
+<source>Cannot find current FreeFileSync version number online. Do you want to check manually?</source>
+<target>Ne mogu pronaći trenutnu verziju FreeFileSync-a online. Dali želite ručno potražiti?</target>
+
 <source>Symlink</source>
 <target>Poveznica simbola</target>
 
@@ -690,12 +690,18 @@ Naredba će biti pokrenuta ako se:
 <source>&Global settings...</source>
 <target>&Globalne postavke...</target>
 
+<source>&Tools</source>
+<target>&Alati</target>
+
 <source>&Check now</source>
 <target>&Provjeri sada</target>
 
 <source>Check &automatically once a week</source>
 <target>Provjeri &automatski jednom tjedno</target>
 
+<source>Check for new &version</source>
+<target>Prvojeri dostupnost nove &verzije</target>
+
 <source>Compare</source>
 <target>Usporedi</target>
 
@@ -753,6 +759,9 @@ Naredba će biti pokrenuta ako se:
 <source>Synchronizing...</source>
 <target>Sinkroniziram...</target>
 
+<source>Minimize to notification area</source>
+<target>Spusti u notifikacije</target>
+
 <source>On completion</source>
 <target>Pri završetku</target>
 
@@ -762,6 +771,18 @@ Naredba će biti pokrenuta ako se:
 <source>&Pause</source>
 <target>&Pauziraj</target>
 
+<source>Variant</source>
+<target>Način</target>
+
+<source>Statistics</source>
+<target>Statistika</target>
+
+<source>Don't show this dialog again</source>
+<target>Ne prikazuj ovaj prozor ponovno</target>
+
+<source>Select a variant</source>
+<target>Odaberite varijantu</target>
+
 <source>
 Files are found equal if
      - last write time and date
@@ -952,7 +973,7 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama.
 <target>Kopiraj datotečna dopuštenja</target>
 
 <source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>Premjesti datotečna dopuštenja (Zahtjeva Administratorska prava)</target>
+<target>Premjesti datotečna dopuštenja (Zahtjeva administratorska prava)</target>
 
 <source>Restore hidden dialogs</source>
 <target>Prikaži skrivene prozore</target>
@@ -966,17 +987,8 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama.
 <source>&Default</source>
 <target>&Zadano</target>
 
-<source>Variant</source>
-<target>Način</target>
-
-<source>Statistics</source>
-<target>Statistika</target>
-
-<source>Don't show this dialog again</source>
-<target>Ne prikazuj ovaj prozor ponovno</target>
-
 <source>Find what:</source>
-<target>Nađi što</target>
+<target>Nađi što:</target>
 
 <source>Match case</source>
 <target>Poklopi se</target>
@@ -984,15 +996,15 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama.
 <source>&Find next</source>
 <target>&Nađi slijedeće</target>
 
+<source>Start synchronization</source>
+<target>Započni sinkronizaciju</target>
+
 <source>Delete</source>
 <target>Izbriši</target>
 
 <source>Configure filter</source>
 <target>Konfiguriraj filter</target>
 
-<source>Start synchronization</source>
-<target>Započni sinkronizaciju</target>
-
 <source>Find</source>
 <target>Pronađi</target>
 
@@ -1027,6 +1039,25 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama.
 <target>Usporedi obje strane</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>Dali stvarno želite izvršiti nardebu %y za %x stavku?</pluralform>
+<pluralform>Dali stvarno želite izvršiti nardebu %y za %x stavke?</pluralform>
+<pluralform>Dali stvarno želite izvršiti nardebu %y za %x stavki?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>Potvrdi</target>
+
+<source>&Execute</source>
+<target>&Izvrši</target>
+
+<source>&Don't show this dialog again</source>
+<target>&Nemoj više prikazivati ovaj dijaloški prozor</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1046,11 +1077,21 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama.
 <pluralform>%x datoteka</pluralform>
 </target>
 
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>%y od %x reda u prikazu</pluralform>
+<pluralform>%y od %x reda u prikazu</pluralform>
+<pluralform>%y od %x reda u prikazu</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>Odaberi smijer:</target>
 
 <source>Exclude temporarily</source>
-<target>Trenutno izključi</target>
+<target>Izuzmi privremeno</target>
 
 <source>Include temporarily</source>
 <target>Trenutno uključi</target>
@@ -1103,6 +1144,9 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama.
 <source>Do you want to save changes to %x?</source>
 <target>Da li želite spremiti izmjene za %x?</target>
 
+<source>Do&n't save</source>
+<target>&Nemoj spremiti</target>
+
 <source>Never save changes</source>
 <target>Nikad ne spremaj promjene</target>
 
@@ -1157,8 +1201,8 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama.
 <source>All folders are in sync</source>
 <target>Sve mape su u sinkronizaciji</target>
 
-<source>Comma separated list</source>
-<target>Zarezom odvojene liste</target>
+<source>Comma-separated values</source>
+<target>Zarezom odvojene vrijednosti</target>
 
 <source>File list exported</source>
 <target>Datotečna lista izvezena</target>
@@ -1211,17 +1255,14 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama.
 <source>Completed</source>
 <target>Završeno</target>
 
-<source>Continue</source>
-<target>Nastavi</target>
-
-<source>Pause</source>
-<target>Pauziraj</target>
+<source>&Continue</source>
+<target>&Nastavi</target>
 
-<source>Logging</source>
-<target>Zapisivanje</target>
+<source>Log</source>
+<target>Dnevnik</target>
 
 <source>Cannot find %x</source>
-<target>Nemogu pronać %x</target>
+<target>Nemogu pronaći %x</target>
 
 <source>Inactive</source>
 <target>Neaktivno</target>
@@ -1253,6 +1294,26 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama.
 <source>Filter</source>
 <target>Filtriranje</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target>
+<pluralform>Dali stvarno želite premjestiti sljedeću %x stavku u koš?</pluralform>
+<pluralform>Dali stvarno želite premjestiti sljedeće %x stavke u koš?</pluralform>
+<pluralform>Dali stvarno želite premjestiti sljedećih %x stavki u koš?</pluralform>
+</target>
+
+<source>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target>
+<pluralform>Dali stvarno želite obrisati sljedeću %x stavku?</pluralform>
+<pluralform>Dali stvarno želite obristi sljedeće %x stavke?</pluralform>
+<pluralform>Dali stvarno želite obristi sljedećih %x stavki?</pluralform>
+</target>
+
 <source>Direct</source>
 <target>Neposredno</target>
 
@@ -1295,9 +1356,6 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama.
 <source>Append a timestamp to each file name</source>
 <target>Dodaj vremensku oznaku svakom imenu datoteke</target>
 
-<source>Folder</source>
-<target>Mapa</target>
-
 <source>File</source>
 <target>Datoteka</target>
 
@@ -1352,6 +1410,9 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama.
 <source>Cannot create directory %x.</source>
 <target>Ne mogu izraditi mapu %x.</target>
 
+<source>Cannot create symbolic link %x.</source>
+<target>Ne mogu stvoriti simboličku vezu %x.</target>
+
 <source>Cannot find system function %x.</source>
 <target>Ne mogu pronaći sistemsku funkciju %x.</target>
 
@@ -1406,6 +1467,9 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama.
 <pluralform>%x dana</pluralform>
 </target>
 
+<source>Failed to register to receive system messages.</source>
+<target>Neuspijela registracija za primanje sistemskih poruka.</target>
+
 <source>Cannot set privilege %x.</source>
 <target>Ne mogu postaviti prava za %x.</target>
 
@@ -1418,6 +1482,9 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama.
 <source>Unable to move %x to the Recycle Bin.</source>
 <target>Nije moguće premjestiti %x u koš za smeće.</target>
 
+<source>Cannot determine final path for %x.</source>
+<target>Ne mogu odrediti završnu putanju za %x.</target>
+
 <source>Error Code %x:</source>
 <target>Pogreška broj %x:</target>
 
diff --git a/BUILD/Languages/dutch.lng b/BUILD/Languages/dutch.lng
index eee7d1fb..911893b9 100644
--- a/BUILD/Languages/dutch.lng
+++ b/BUILD/Languages/dutch.lng
@@ -7,57 +7,6 @@
 	<plural_definition>n == 1 ? 0 : 1</plural_definition>
 </header>
 
-<source>Cannot determine final path for %x.</source>
-<target></target>
-
-<source>Failed to register to receive system messages.</source>
-<target></target>
-
-<source>Cannot create symbolic link %x.</source>
-<target></target>
-
-<source>Select a variant</source>
-<target></target>
-
-<source>Check for new &version</source>
-<target></target>
-
-<source>&Tools</source>
-<target></target>
-
-<source>Cannot find current FreeFileSync version number online. Do you want to check manually?</source>
-<target></target>
-
-<source>&Download</source>
-<target></target>
-
-<source>New version found</source>
-<target></target>
-
-<source>Switching to FreeFileSync main dialog</source>
-<target></target>
-
-<source>Data verification error: %x and %y have different content.</source>
-<target></target>
-
-<source>Cannot determine volume name for %x.</source>
-<target></target>
-
-<source>Starting comparison</source>
-<target></target>
-
-<source>Resolving symbolic link %x</source>
-<target></target>
-
-<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source>
-<target></target>
-
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target></target>
-
-<source>The database entry is not in sync considering current settings.</source>
-<target></target>
-
 <source>Both sides have changed since last synchronization.</source>
 <target>Beide zijdes zijn veranderd sinds de laatste synchronisatie.</target>
 
@@ -67,6 +16,9 @@
 <source>No change since last synchronization.</source>
 <target>Geen veranderingen sinds de laatste synchronisatie.</target>
 
+<source>The database entry is not in sync considering current settings.</source>
+<target>De database is niet gesynchroniseerd volgens de huidige instellingen.</target>
+
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>Stel standaard synchronisatie richtingen in: Oude bestanden worden door nieuwere bestanden overschreven.</target>
 
@@ -91,11 +43,20 @@
 <source>Deleting symbolic link %x</source>
 <target>Verwijderen van snelkoppeling %x</target>
 
+<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>De Prullenbak is niet beschikbaar voor de volgende mappen. De bestanden zullen permanent worden verwijderd:</target>
+
 <source>An exception occurred</source>
 <target>Er heeft een uitzondering plaatsgevonden</target>
 
-<source>Cannot find file %x.</source>
-<target>Kan bestand %x niet vinden.</target>
+<source>A directory path is expected after %x.</source>
+<target>Een bestandslocatie pad is verwacht na %x.</target>
+
+<source>Syntax error</source>
+<target>Syntax fout</target>
+
+<source>Cannot open file %x.</source>
+<target>Kan bestand %x niet openen.</target>
 
 <source>Error</source>
 <target>Fout</target>
@@ -103,6 +64,36 @@
 <source>File %x does not contain a valid configuration.</source>
 <target>Bestand %x bevat geen valide configuratie.</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>Oneven nummer van linker en rechter bestandslocaties gespecificeerd.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>Het configuratiebestand mag geen instellingen bevatten voor een bestandslocatie level als bestandslocaties in de command line ingesteld zijn.</target>
+
+<source>Warning</source>
+<target>Waarschuwing</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>Bestandslocaties kunnen niet voor meer dan een configuratiebestand gemaakt worden.</target>
+
+<source>Syntax:</source>
+<target>Syntax:</target>
+
+<source>config files</source>
+<target>configuratiebestanden</target>
+
+<source>directory</source>
+<target>bestandslocatie</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>Elk aantal FreeFileSync .ffs_gui en/of .ffs_batch configuratiebestanden.</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>Elk aantal alternatieve bestandslocaties voor een configuratiebestand.</target>
+
+<source>Command line</source>
+<target>Opdrachtregel</target>
+
 <source>A folder input field is empty.</source>
 <target>Een map invoerveld is leeg.</target>
 
@@ -115,6 +106,9 @@
 <source>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
 <target>U kunt deze foutmelding negeren om elke map als leeg te markeren. De mappen worden dan automatisch aangemaakt tijdens de synchronisatie.</target>
 
+<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source>
+<target>De volgende mappen hebben afhankelijke paden. Wees voorzichtig bij het opzetten van synchronisatieregels:</target>
+
 <source>File %x has an invalid date.</source>
 <target>Bestand %x heeft een ongeldige datum.</target>
 
@@ -130,12 +124,18 @@
 <source>Items differ in attributes only</source>
 <target>Items verschillen alleen in attributen</target>
 
+<source>Resolving symbolic link %x</source>
+<target>Bezig met vinden van snelkoppeling %x</target>
+
 <source>Comparing content of files %x</source>
 <target>De inhoud van %x bestanden wordt vergeleken</target>
 
 <source>Generating file list...</source>
 <target>Genereren van bestandslijst...</target>
 
+<source>Starting comparison</source>
+<target>Vergelijking starten</target>
+
 <source>Calculating sync directions...</source>
 <target>Synchronisatie richtingen calculeren...</target>
 
@@ -251,12 +251,12 @@
 <target>Totale tijd:</target>
 
 <source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </source>
 <target>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </target>
 
 <source>%x MB</source>
@@ -278,12 +278,12 @@
 <target>Doorzoekt:</target>
 
 <source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </source>
 <target>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </target>
 
 <source>Encoding extended time information: %x</source>
@@ -292,6 +292,9 @@
 <source>/sec</source>
 <target>/sec</target>
 
+<source>%x items</source>
+<target>%x items</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>Configuratiebestand %x alleen deels geladen.</target>
 
@@ -313,8 +316,11 @@
 <source>Cannot load file %x.</source>
 <target>Kan bestand %x niet laden.</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>Schijfnaam %x maakt geen deel uit van bestandsnaam %y.</target>
+<source>Cannot determine volume name for %x.</source>
+<target>Kan volumenaam voor %x niet bepalen.</target>
+
+<source>Volume name %x is not part of file path %y.</source>
+<target>Schijfnaam %x is geen deel van bestandspad %y.</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Bezig met afbreken: Wacht op beëindiging huidige bewerking...</target>
@@ -382,9 +388,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>Tijd tussen de laatste gedetecteerde verandering en de uitvoering van het commando</target>
 
-<source>Command line</source>
-<target>Opdrachtregel</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -408,9 +411,6 @@ De opdracht word geactiveerd als:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Geautomatiseerde Synchronisatie</target>
 
-<source>Warning</source>
-<target>Waarschuwing</target>
-
 <source>Build: %x</source>
 <target>Build: %x</target>
 
@@ -420,15 +420,21 @@ De opdracht word geactiveerd als:
 <source>All files</source>
 <target>Alle bestanden</target>
 
+<source>Directory monitoring active</source>
+<target>Bestandslocatie controle actief</target>
+
+<source>Waiting until all directories are available...</source>
+<target>Wachten tot alle bestandslocaties beschikbaar zijn...</target>
+
 <source>&Restore</source>
 <target>&Herstellen</target>
 
+<source>&Show error</source>
+<target>Laat &fouten zien</target>
+
 <source>&Exit</source>
 <target>&Afsluiten</target>
 
-<source>Waiting for missing directories...</source>
-<target>Wacht op ontbrekende mappen...</target>
-
 <source>Invalid command line:</source>
 <target>Ongeldige opdrachtregel:</target>
 
@@ -438,14 +444,14 @@ De opdracht word geactiveerd als:
 <source>File time and size</source>
 <target>Bestandstijd- en grootte</target>
 
-<source> Two way </source>
-<target> Twee kanten op </target>
+<source>Two way</source>
+<target>Twee kanten op</target>
 
 <source>Mirror</source>
-<target>Spiegelen </target>
+<target>Spiegelen</target>
 
 <source>Update</source>
-<target>Bijwerken </target>
+<target>Bijwerken</target>
 
 <source>Custom</source>
 <target>Aangepast</target>
@@ -501,11 +507,8 @@ De opdracht word geactiveerd als:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>De volgende items hebben onopgeloste conflicten en zullen niet worden gesynchroniseerd:</target>
 
-<source>Significant difference detected:</source>
-<target>Significant verschil gedetecteerd:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>Meer dan 50% van alle bestanden zal gekopiëerd of verwijderd worden.</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>De volgende mappen zijn heel verschillend. Wees er zeker van dat dit de goede mappen zijn voor synchronisatie.</target>
 
 <source>Not enough free disk space available in:</source>
 <target>Niet genoeg vrije schijfruimte beschikbaar op:</target>
@@ -528,6 +531,9 @@ De opdracht word geactiveerd als:
 <source>Creating Volume Shadow Copy for %x...</source>
 <target>Bezig met Volume Schaduwkopie te maken voor %x...</target>
 
+<source>Data verification error: %x and %y have different content.</source>
+<target>Data verificatie fout: %x en %y hebben een verschillende inhoud.</target>
+
 <source>Synchronization aborted</source>
 <target>Synchronisatie afgebroken</target>
 
@@ -549,12 +555,24 @@ De opdracht word geactiveerd als:
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
 <target>Druk op "Omschakelen" om problemen op te lossen in het hoofdscherm van FreeFileSync.</target>
 
+<source>Switching to FreeFileSync main dialog</source>
+<target>Wisselen naar FreeFileSync hoofdscherm</target>
+
+<source>Retrying operation after error:</source>
+<target>Bewerking opnieuw proberen na fout:</target>
+
 <source>A new version of FreeFileSync is available:</source>
 <target>Er is een nieuwe versie van FreeFileSync beschikbaar:</target>
 
 <source>Download now?</source>
 <target>Nu downloaden?</target>
 
+<source>New version found</source>
+<target>Nieuwe versie gevonden</target>
+
+<source>&Download</source>
+<target>&Download</target>
+
 <source>FreeFileSync is up to date.</source>
 <target>U gebruikt de nieuwste versie van FreeFileSync.</target>
 
@@ -564,6 +582,9 @@ De opdracht word geactiveerd als:
 <source>Unable to connect to sourceforge.net.</source>
 <target>Kan geen verbinding maken met sourceforge.net.</target>
 
+<source>Cannot find current FreeFileSync version number online. Do you want to check manually?</source>
+<target>Kan huidige FreeFileSync versienummer niet online vinden. Wilt u handmatig controleren?</target>
+
 <source>Symlink</source>
 <target>Symlink</target>
 
@@ -666,12 +687,18 @@ De opdracht word geactiveerd als:
 <source>&Global settings...</source>
 <target>&Algemene instellingen...</target>
 
+<source>&Tools</source>
+<target>&Gereedschap</target>
+
 <source>&Check now</source>
 <target>&Controleer nu</target>
 
 <source>Check &automatically once a week</source>
 <target>Controleer &automatisch eens per week</target>
 
+<source>Check for new &version</source>
+<target>Kijk voor een nieuwe &versie</target>
+
 <source>Compare</source>
 <target>Vergelijk</target>
 
@@ -729,6 +756,9 @@ De opdracht word geactiveerd als:
 <source>Synchronizing...</source>
 <target>Synchroniseert...</target>
 
+<source>Minimize to notification area</source>
+<target>Minimaliseer naar systeemvak</target>
+
 <source>On completion</source>
 <target>Na voltooiing</target>
 
@@ -738,6 +768,18 @@ De opdracht word geactiveerd als:
 <source>&Pause</source>
 <target>&Pauze</target>
 
+<source>Variant</source>
+<target>Variant</target>
+
+<source>Statistics</source>
+<target>Statistieken</target>
+
+<source>Don't show this dialog again</source>
+<target>Laat deze dialoog niet meer zien</target>
+
+<source>Select a variant</source>
+<target>Selecteer een variant</target>
+
 <source>
 Files are found equal if
      - last write time and date
@@ -942,15 +984,6 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen.
 <source>&Default</source>
 <target>&Standaard</target>
 
-<source>Variant</source>
-<target>Variant</target>
-
-<source>Statistics</source>
-<target>Statistieken</target>
-
-<source>Don't show this dialog again</source>
-<target>Laat deze dialoog niet meer zien</target>
-
 <source>Find what:</source>
 <target>Vind wat:</target>
 
@@ -960,15 +993,15 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen.
 <source>&Find next</source>
 <target>&Vind volgende</target>
 
+<source>Start synchronization</source>
+<target>Start synchronisatie</target>
+
 <source>Delete</source>
 <target>Verwijderen</target>
 
 <source>Configure filter</source>
 <target>Filterconfiguratie</target>
 
-<source>Start synchronization</source>
-<target>Start synchronisatie</target>
-
 <source>Find</source>
 <target>Vind</target>
 
@@ -1003,6 +1036,24 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen.
 <target>Vergelijk beide zijdes</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>Weet u zeker dat u commando %y wilt uitvoeren voor 1 item?</pluralform>
+<pluralform>Weet u zeker dat u commando %y wilt uitvoeren voor %x items?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>Bevestigen</target>
+
+<source>&Execute</source>
+<target>&Uitvoeren</target>
+
+<source>&Don't show this dialog again</source>
+<target>Laat deze dialoog &niet meer zien</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1143,8 +1194,8 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen.
 <source>All folders are in sync</source>
 <target>Alle mappen zijn gesynchroniseerd</target>
 
-<source>Comma separated list</source>
-<target>Kommagescheiden bestand</target>
+<source>Comma-separated values</source>
+<target>Door komma gescheiden waarden</target>
 
 <source>File list exported</source>
 <target>Bestandslijst geëxporteerd</target>
@@ -1197,14 +1248,11 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen.
 <source>Completed</source>
 <target>Voltooid</target>
 
-<source>Continue</source>
-<target>Doorgaan</target>
+<source>&Continue</source>
+<target>&Doorgaan</target>
 
-<source>Pause</source>
-<target>Pauze</target>
-
-<source>Logging</source>
-<target>Loggen</target>
+<source>Log</source>
+<target>Log</target>
 
 <source>Cannot find %x</source>
 <target>Kan %x niet vinden</target>
@@ -1299,9 +1347,6 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen.
 <source>Append a timestamp to each file name</source>
 <target>Voeg een timestamp aan elke bestandsnaam toe</target>
 
-<source>Folder</source>
-<target>Map</target>
-
 <source>File</source>
 <target>Bestand</target>
 
@@ -1356,6 +1401,9 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen.
 <source>Cannot create directory %x.</source>
 <target>Kan map %x niet aanmaken.</target>
 
+<source>Cannot create symbolic link %x.</source>
+<target>Kan snelkoppeling %x niet aanmaken.</target>
+
 <source>Cannot find system function %x.</source>
 <target>Kan systeemfunctie %x niet vinden.</target>
 
@@ -1407,6 +1455,9 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen.
 <pluralform>%x dagen</pluralform>
 </target>
 
+<source>Failed to register to receive system messages.</source>
+<target>Registreren voor het ontvangen van systeemmeldingen is mislukt.</target>
+
 <source>Cannot set privilege %x.</source>
 <target>Kan privilege %x niet instellen.</target>
 
@@ -1419,6 +1470,9 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen.
 <source>Unable to move %x to the Recycle Bin.</source>
 <target>Niet mogelijk om %x naar de Prullenbak te verplaatsen.</target>
 
+<source>Cannot determine final path for %x.</source>
+<target>Kan pad voor %x niet vaststellen.</target>
+
 <source>Error Code %x:</source>
 <target>Foutcode %x:</target>
 
diff --git a/BUILD/Languages/english_uk.lng b/BUILD/Languages/english_uk.lng
index d1fcab3d..753ccfd0 100644
--- a/BUILD/Languages/english_uk.lng
+++ b/BUILD/Languages/english_uk.lng
@@ -49,8 +49,14 @@
 <source>An exception occurred</source>
 <target>An exception occurred</target>
 
-<source>Cannot find file %x.</source>
-<target>Cannot find file %x.</target>
+<source>A directory path is expected after %x.</source>
+<target>A directory path is expected after %x.</target>
+
+<source>Syntax error</source>
+<target>Syntax error</target>
+
+<source>Cannot open file %x.</source>
+<target>Cannot open file %x.</target>
 
 <source>Error</source>
 <target>Error</target>
@@ -58,6 +64,36 @@
 <source>File %x does not contain a valid configuration.</source>
 <target>File %x does not contain a valid configuration.</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>Unequal number of left and right directories specified.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>The config file must not contain settings at directory pair level when directories are set via command line.</target>
+
+<source>Warning</source>
+<target>Warning</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>Directories cannot be set for more than one configuration file.</target>
+
+<source>Syntax:</source>
+<target>Syntax:</target>
+
+<source>config files</source>
+<target>config files</target>
+
+<source>directory</source>
+<target>directory</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>Any number of alternative directories for at most one config file.</target>
+
+<source>Command line</source>
+<target>Command line</target>
+
 <source>A folder input field is empty.</source>
 <target>A folder input field is empty.</target>
 
@@ -215,12 +251,12 @@
 <target>Total time:</target>
 
 <source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </source>
 <target>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </target>
 
 <source>%x MB</source>
@@ -242,12 +278,12 @@
 <target>Scanning:</target>
 
 <source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </source>
 <target>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </target>
 
 <source>Encoding extended time information: %x</source>
@@ -256,6 +292,9 @@
 <source>/sec</source>
 <target>/sec</target>
 
+<source>%x items</source>
+<target>%x items</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>Configuration file %x loaded partially only.</target>
 
@@ -280,8 +319,8 @@
 <source>Cannot determine volume name for %x.</source>
 <target>Cannot determine volume name for %x.</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>Volume name %x not part of file name %y.</target>
+<source>Volume name %x is not part of file path %y.</source>
+<target>Volume name %x is not part of file path %y.</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Abort requested: Waiting for current operation to finish...</target>
@@ -349,9 +388,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>Idle time between last detected change and execution of command</target>
 
-<source>Command line</source>
-<target>Command line</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -375,9 +411,6 @@ The command is triggered if:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automated Synchronisation</target>
 
-<source>Warning</source>
-<target>Warning</target>
-
 <source>Build: %x</source>
 <target>Build: %x</target>
 
@@ -387,15 +420,21 @@ The command is triggered if:
 <source>All files</source>
 <target>All files</target>
 
+<source>Directory monitoring active</source>
+<target>Directory monitoring active</target>
+
+<source>Waiting until all directories are available...</source>
+<target>Waiting until all directories are available...</target>
+
 <source>&Restore</source>
 <target>&Restore</target>
 
+<source>&Show error</source>
+<target>&Show error</target>
+
 <source>&Exit</source>
 <target>&Exit</target>
 
-<source>Waiting for missing directories...</source>
-<target>Waiting for missing directories...</target>
-
 <source>Invalid command line:</source>
 <target>Invalid command line:</target>
 
@@ -405,14 +444,14 @@ The command is triggered if:
 <source>File time and size</source>
 <target>File time and size</target>
 
-<source> Two way </source>
-<target> Two way </target>
+<source>Two way</source>
+<target>Two way</target>
 
 <source>Mirror</source>
-<target>Mirror </target>
+<target>Mirror</target>
 
 <source>Update</source>
-<target>Update </target>
+<target>Update</target>
 
 <source>Custom</source>
 <target>Custom</target>
@@ -468,11 +507,8 @@ The command is triggered if:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>The following items have unresolved conflicts and will not be synchronised:</target>
 
-<source>Significant difference detected:</source>
-<target>Significant difference detected:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>More than 50% of the total number of files will be copied or deleted.</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>The following folders are significantly different. Make sure you are matching the correct folders for synchronisation.</target>
 
 <source>Not enough free disk space available in:</source>
 <target>Not enough free disk space available in:</target>
@@ -520,7 +556,10 @@ The command is triggered if:
 <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>Retrying operation after error:</source>
+<target>Retrying operation after error:</target>
 
 <source>A new version of FreeFileSync is available:</source>
 <target>A new version of FreeFileSync is available:</target>
@@ -717,6 +756,9 @@ The command is triggered if:
 <source>Synchronizing...</source>
 <target>Synchronising...</target>
 
+<source>Minimize to notification area</source>
+<target>Minimize to notification area</target>
+
 <source>On completion</source>
 <target>On completion</target>
 
@@ -726,6 +768,15 @@ The command is triggered if:
 <source>&Pause</source>
 <target>&Pause</target>
 
+<source>Variant</source>
+<target>Variant</target>
+
+<source>Statistics</source>
+<target>Statistics</target>
+
+<source>Don't show this dialog again</source>
+<target>Don't show this dialogue again</target>
+
 <source>Select a variant</source>
 <target>Select a variant</target>
 
@@ -933,15 +984,6 @@ Note: File names must be relative to base directories.
 <source>&Default</source>
 <target>&Default</target>
 
-<source>Variant</source>
-<target>Variant</target>
-
-<source>Statistics</source>
-<target>Statistics</target>
-
-<source>Don't show this dialog again</source>
-<target>Don't show this dialogue again</target>
-
 <source>Find what:</source>
 <target>Find what:</target>
 
@@ -951,15 +993,15 @@ Note: File names must be relative to base directories.
 <source>&Find next</source>
 <target>&Find next</target>
 
+<source>Start synchronization</source>
+<target>Start synchronisation</target>
+
 <source>Delete</source>
 <target>Delete</target>
 
 <source>Configure filter</source>
 <target>Configure filter</target>
 
-<source>Start synchronization</source>
-<target>Start synchronisation</target>
-
 <source>Find</source>
 <target>Find</target>
 
@@ -994,6 +1036,24 @@ Note: File names must be relative to base directories.
 <target>Compare both sides</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>Confirm</target>
+
+<source>&Execute</source>
+<target>&Execute</target>
+
+<source>&Don't show this dialog again</source>
+<target>&Don't show this dialogue again</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1134,8 +1194,8 @@ Note: File names must be relative to base directories.
 <source>All folders are in sync</source>
 <target>All folders are in sync</target>
 
-<source>Comma separated list</source>
-<target>Comma separated list</target>
+<source>Comma-separated values</source>
+<target>Comma-separated values</target>
 
 <source>File list exported</source>
 <target>File list exported</target>
@@ -1188,14 +1248,11 @@ Note: File names must be relative to base directories.
 <source>Completed</source>
 <target>Completed</target>
 
-<source>Continue</source>
-<target>Continue</target>
+<source>&Continue</source>
+<target>&Continue</target>
 
-<source>Pause</source>
-<target>Pause</target>
-
-<source>Logging</source>
-<target>Logging</target>
+<source>Log</source>
+<target>Log</target>
 
 <source>Cannot find %x</source>
 <target>Cannot find %x</target>
@@ -1290,9 +1347,6 @@ Note: File names must be relative to base directories.
 <source>Append a timestamp to each file name</source>
 <target>Append a timestamp to each file name</target>
 
-<source>Folder</source>
-<target>Folder</target>
-
 <source>File</source>
 <target>File</target>
 
diff --git a/BUILD/Languages/german.lng b/BUILD/Languages/german.lng
index 94c955a4..35c30a34 100644
--- a/BUILD/Languages/german.lng
+++ b/BUILD/Languages/german.lng
@@ -7,9 +7,6 @@
 	<plural_definition>n == 1 ? 0 : 1</plural_definition>
 </header>
 
-<source>Retrying operation after error:</source>
-<target>Wiederhole Operation nach Fehler:</target>
-
 <source>Both sides have changed since last synchronization.</source>
 <target>Beide Seiten wurden seit der letzten Synchronisation verändert.</target>
 
@@ -52,8 +49,14 @@
 <source>An exception occurred</source>
 <target>Eine Ausnahme ist aufgetreten</target>
 
-<source>Cannot find file %x.</source>
-<target>Die Datei %x wurde nicht gefunden.</target>
+<source>A directory path is expected after %x.</source>
+<target>Ein Verzeichnispfad wird nach %x erwartet.</target>
+
+<source>Syntax error</source>
+<target>Syntaxfehler</target>
+
+<source>Cannot open file %x.</source>
+<target>Die Datei %x kann nicht geöffnet werden.</target>
 
 <source>Error</source>
 <target>Fehler</target>
@@ -61,6 +64,36 @@
 <source>File %x does not contain a valid configuration.</source>
 <target>Die Datei %x enthält keine gültige Konfiguration.</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>Ungleiche Anzahl linker und rechter Verzeichnisse angegeben.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>Die Konfigurationsdatei darf keine Einstellungen auf Verzeichnispaarebene enthalten, wenn Verzeichnisse über die Befehlszeile gesetzt werden.</target>
+
+<source>Warning</source>
+<target>Warnung</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>Verzeichnisse können nicht für mehr als eine Konfigurationsdatei gesetzt werden.</target>
+
+<source>Syntax:</source>
+<target>Syntax:</target>
+
+<source>config files</source>
+<target>Konfigurationsdateien</target>
+
+<source>directory</source>
+<target>Verzeichnis</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>Beliebige Anzahl von FreeFileSync .ffs_gui und/oder .ffs_batch Konfigurationsdateien.</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>Beliebige Anzahl von alternativen Verzeichnissen für höchstens eine Konfigurationsdatei.</target>
+
+<source>Command line</source>
+<target>Befehlszeile</target>
+
 <source>A folder input field is empty.</source>
 <target>Ein Ordnereingabefeld ist leer.</target>
 
@@ -71,7 +104,7 @@
 <target>Die folgenden Ordner wurden nicht gefunden:</target>
 
 <source>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
-<target>Dieser Fehler kann ignoriert werden, um die Ordner als leer anzusehen. Die Ordner werden dann beim Synchronisieren automatisch erstellt.</target>
+<target>Dieser Fehler kann ignoriert werden, um die Ordner als leer anzusehen und beim Synchronisieren automatisch zu erstellen.</target>
 
 <source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source>
 <target>Die folgenden Ordner haben abhängige Pfade. Achtung beim Festlegen der Synchronisationsregeln:</target>
@@ -218,8 +251,8 @@
 <target>Gesamtzeit:</target>
 
 <source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </source>
 <target>
 <pluralform>1 Byte</pluralform>
@@ -245,12 +278,12 @@
 <target>Suche Dateien:</target>
 
 <source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </source>
 <target>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 Thread</pluralform>
+<pluralform>%x Threads</pluralform>
 </target>
 
 <source>Encoding extended time information: %x</source>
@@ -259,6 +292,9 @@
 <source>/sec</source>
 <target>/s</target>
 
+<source>%x items</source>
+<target>%x Elemente</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>Die Konfigurationsdatei %x wurde nur teilweise geladen.</target>
 
@@ -283,8 +319,8 @@
 <source>Cannot determine volume name for %x.</source>
 <target>Der Laufwerksname für %x konnte nicht bestimmt werden.</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>Laufwerksname %x ist kein Teil des Dateinamens %y.</target>
+<source>Volume name %x is not part of file path %y.</source>
+<target>Laufwerksname %x ist kein Teil des Dateipfades %y.</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Abbruch initiiert: Warte bis die aktuelle Operation beendet ist...</target>
@@ -352,16 +388,13 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>Ruhezeit zwischen der letzten erkannten Änderung und dem Aufruf der Befehlszeile</target>
 
-<source>Command line</source>
-<target>Befehlszeile</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
 - new folders arrive (e.g. USB stick insert)
 </source>
 <target>
-Die Befehlszeile wird ausgelöst wenn:
+Die Befehlszeile wird ausgelöst, wenn:
 - Dateien oder Unterordner sich ändern
 - neue Ordner erscheinen (z.B. Anschluss eines USB Sticks)
 </target>
@@ -378,9 +411,6 @@ Die Befehlszeile wird ausgelöst wenn:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatisierte Synchronisation</target>
 
-<source>Warning</source>
-<target>Warnung</target>
-
 <source>Build: %x</source>
 <target>Build: %x</target>
 
@@ -390,15 +420,21 @@ Die Befehlszeile wird ausgelöst wenn:
 <source>All files</source>
 <target>Alle Dateien</target>
 
+<source>Directory monitoring active</source>
+<target>Verzeichnisüberwachung ist aktiv</target>
+
+<source>Waiting until all directories are available...</source>
+<target>Warte bis alle Verzeichnisse verfügbar sind...</target>
+
 <source>&Restore</source>
 <target>&Wiederherstellen</target>
 
+<source>&Show error</source>
+<target>&Zeige Fehler</target>
+
 <source>&Exit</source>
 <target>&Beenden</target>
 
-<source>Waiting for missing directories...</source>
-<target>Warte auf fehlende Verzeichnisse...</target>
-
 <source>Invalid command line:</source>
 <target>Ungültige Befehlszeile:</target>
 
@@ -408,14 +444,14 @@ Die Befehlszeile wird ausgelöst wenn:
 <source>File time and size</source>
 <target>Datum und Größe</target>
 
-<source> Two way </source>
-<target> Zwei Wege </target>
+<source>Two way</source>
+<target>Zwei Wege</target>
 
 <source>Mirror</source>
-<target>Spiegeln </target>
+<target>Spiegeln</target>
 
 <source>Update</source>
-<target>Aktualisieren </target>
+<target>Aktualisieren</target>
 
 <source>Custom</source>
 <target>Eigene</target>
@@ -471,11 +507,8 @@ Die Befehlszeile wird ausgelöst wenn:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>Die folgenden Elemente haben ungelöste Konflikte und werden nicht synchronisiert werden:</target>
 
-<source>Significant difference detected:</source>
-<target>Ein erheblicher Unterschied wurde festgestellt:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>Mehr als 50% aller Dateien werden kopiert oder gelöscht.</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>Die folgenden Ordner unterscheiden sich erheblich. Stellen Sie sicher, dass die richtigen Ordner für die Synchronisation ausgewählt sind.</target>
 
 <source>Not enough free disk space available in:</source>
 <target>Nicht genügend freier Speicher verfügbar unter:</target>
@@ -525,6 +558,9 @@ Die Befehlszeile wird ausgelöst wenn:
 <source>Switching to FreeFileSync main dialog</source>
 <target>Wechsle in FreeFileSyncs Hauptdialog</target>
 
+<source>Retrying operation after error:</source>
+<target>Wiederhole Operation nach Fehler:</target>
+
 <source>A new version of FreeFileSync is available:</source>
 <target>Eine neue Version von FreeFileSync ist verfügbar:</target>
 
@@ -720,6 +756,9 @@ Die Befehlszeile wird ausgelöst wenn:
 <source>Synchronizing...</source>
 <target>Synchronisiere...</target>
 
+<source>Minimize to notification area</source>
+<target>In das Benachrichtigungsfeld minimieren</target>
+
 <source>On completion</source>
 <target>Nach Abschluss</target>
 
@@ -729,6 +768,15 @@ Die Befehlszeile wird ausgelöst wenn:
 <source>&Pause</source>
 <target>&Pause</target>
 
+<source>Variant</source>
+<target>Variante</target>
+
+<source>Statistics</source>
+<target>Statistiken</target>
+
+<source>Don't show this dialog again</source>
+<target>Diesen Dialog nicht mehr anzeigen</target>
+
 <source>Select a variant</source>
 <target>Variante auswählen</target>
 
@@ -936,15 +984,6 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein.
 <source>&Default</source>
 <target>&Standard</target>
 
-<source>Variant</source>
-<target>Variante</target>
-
-<source>Statistics</source>
-<target>Statistiken</target>
-
-<source>Don't show this dialog again</source>
-<target>Diesen Dialog nicht mehr anzeigen</target>
-
 <source>Find what:</source>
 <target>Suchen nach:</target>
 
@@ -954,15 +993,15 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein.
 <source>&Find next</source>
 <target>&Weitersuchen</target>
 
+<source>Start synchronization</source>
+<target>Synchronisation starten</target>
+
 <source>Delete</source>
 <target>Löschen</target>
 
 <source>Configure filter</source>
 <target>Konfiguriere Filter</target>
 
-<source>Start synchronization</source>
-<target>Synchronisation starten</target>
-
 <source>Find</source>
 <target>Suchen</target>
 
@@ -997,6 +1036,24 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein.
 <target>Beide Seiten vergleichen</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>Soll der Befehl %y wirklich für 1 Element ausgeführt werden?</pluralform>
+<pluralform>Soll der Befehl %y wirklich für %x Elemente ausgeführt werden?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>Bestätigen</target>
+
+<source>&Execute</source>
+<target>&Ausführen</target>
+
+<source>&Don't show this dialog again</source>
+<target>&Diesen Dialog nicht mehr anzeigen</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1137,8 +1194,8 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein.
 <source>All folders are in sync</source>
 <target>Alle Ordner sind synchron</target>
 
-<source>Comma separated list</source>
-<target>Kommagetrennte Liste</target>
+<source>Comma-separated values</source>
+<target>Kommagetrennte Werte</target>
 
 <source>File list exported</source>
 <target>Dateiliste exportiert</target>
@@ -1191,13 +1248,10 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein.
 <source>Completed</source>
 <target>Fertig</target>
 
-<source>Continue</source>
-<target>Fortfahren</target>
+<source>&Continue</source>
+<target>&Fortfahren</target>
 
-<source>Pause</source>
-<target>Pause</target>
-
-<source>Logging</source>
+<source>Log</source>
 <target>Protokoll</target>
 
 <source>Cannot find %x</source>
@@ -1293,9 +1347,6 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein.
 <source>Append a timestamp to each file name</source>
 <target>Einen Zeitstempel an jeden Dateinamen anhängen</target>
 
-<source>Folder</source>
-<target>Ordner</target>
-
 <source>File</source>
 <target>Datei</target>
 
diff --git a/BUILD/Languages/italian.lng b/BUILD/Languages/italian.lng
index e1bfa558..3dcac298 100644
--- a/BUILD/Languages/italian.lng
+++ b/BUILD/Languages/italian.lng
@@ -1,73 +1,82 @@
 <header>
 	<language>Italiano</language>
-	<translator>Emmo</translator>
+	<translator>Luciano Paravella</translator>
 	<locale>it_IT</locale>
 	<flag_image>flag_italy.png</flag_image>
 	<plural_form_count>2</plural_form_count>
 	<plural_definition>n == 1 ? 0 : 1</plural_definition>
 </header>
 
-<source>Cannot determine final path for %x.</source>
+<source>Log</source>
 <target></target>
 
-<source>Failed to register to receive system messages.</source>
+<source>Comma-separated values</source>
 <target></target>
 
-<source>Cannot create symbolic link %x.</source>
+<source>Minimize to notification area</source>
 <target></target>
 
-<source>Items</source>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
 <target></target>
 
-<source>
-<pluralform>%y of 1 row in view</pluralform>
-<pluralform>%y of %x rows in view</pluralform>
-</source>
+<source>&Show error</source>
 <target></target>
 
-<source>Select a variant</source>
+<source>Waiting until all directories are available...</source>
 <target></target>
 
-<source>Check for new &version</source>
+<source>Directory monitoring active</source>
 <target></target>
 
-<source>&Tools</source>
+<source>Volume name %x is not part of file path %y.</source>
 <target></target>
 
-<source>Cannot find current FreeFileSync version number online. Do you want to check manually?</source>
+<source>%x items</source>
 <target></target>
 
-<source>&Download</source>
+<source>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
+</source>
 <target></target>
 
-<source>New version found</source>
+<source>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
+</source>
 <target></target>
 
-<source>Switching to FreeFileSync main dialog</source>
+<source>Any number of alternative directories for at most one config file.</source>
 <target></target>
 
-<source>Data verification error: %x and %y have different content.</source>
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
 <target></target>
 
-<source>Cannot determine volume name for %x.</source>
+<source>directory</source>
 <target></target>
 
-<source>Starting comparison</source>
+<source>config files</source>
 <target></target>
 
-<source>Resolving symbolic link %x</source>
+<source>Syntax:</source>
 <target></target>
 
-<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source>
+<source>Directories cannot be set for more than one configuration file.</source>
 <target></target>
 
-<source>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
 <target></target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<source>Unequal number of left and right directories specified.</source>
 <target></target>
 
-<source>The database entry is not in sync considering current settings.</source>
+<source>Cannot open file %x.</source>
+<target></target>
+
+<source>Syntax error</source>
+<target></target>
+
+<source>A directory path is expected after %x.</source>
 <target></target>
 
 <source>Both sides have changed since last synchronization.</source>
@@ -79,8 +88,11 @@
 <source>No change since last synchronization.</source>
 <target>Nessun cambiamento dall'ultima sincronizzazione.</target>
 
+<source>The database entry is not in sync considering current settings.</source>
+<target>La voce di database non è in sincronia con le impostazioni correnti.</target>
+
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
-<target>Imposta direzioni di sincronizzazione dpredefinite: i vecchi file saranno sovrascritti dai nuovi.</target>
+<target>Imposta le direzioni di sincronizzazione predefinite: i vecchi file saranno sovrascritti dai nuovi.</target>
 
 <source>Checking recycle bin availability for folder %x...</source>
 <target>Controllo di disponibilità Cestino per la cartella %x...</target>
@@ -103,20 +115,26 @@
 <source>Deleting symbolic link %x</source>
 <target>Eliminazione collegamento %x</target>
 
+<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>Il Cestino non è disponibile per le seguenti cartelle. I file verranno quindi eliminati in modo permanente:</target>
+
 <source>An exception occurred</source>
 <target>Si è verificata una eccezione</target>
 
-<source>Cannot find file %x.</source>
-<target>Impossibile trovare il file %x.</target>
-
 <source>Error</source>
 <target>Errore</target>
 
 <source>File %x does not contain a valid configuration.</source>
 <target>Il file %x non contiene una configurazione valida.</target>
 
+<source>Warning</source>
+<target>Attenzione</target>
+
+<source>Command line</source>
+<target>Linea di comando</target>
+
 <source>A folder input field is empty.</source>
-<target>Un campo cartella input è vuoto.</target>
+<target>Un campo di input cartella è vuoto.</target>
 
 <source>The corresponding folder will be considered as empty.</source>
 <target>La cartella corrispondente sarà considerata come vuota.</target>
@@ -124,6 +142,12 @@
 <source>Cannot find the following folders:</source>
 <target>Impossibile trovare le seguenti cartelle:</target>
 
+<source>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
+<target>È possibile ignorare questo errore che considera ogni cartella come vuota. Le cartelle poi verranno create automaticamente durante la sincronizzazione.</target>
+
+<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source>
+<target>Le seguenti cartelle hanno percorsi dipendenti. Fare attenzione quando si imposta le regole di sincronizzazione:</target>
+
 <source>File %x has an invalid date.</source>
 <target>Il file %x ha una data non valida.</target>
 
@@ -139,12 +163,18 @@
 <source>Items differ in attributes only</source>
 <target>Gli oggetti differiscono solo negli attributi</target>
 
+<source>Resolving symbolic link %x</source>
+<target>Risoluzione collegamento %x</target>
+
 <source>Comparing content of files %x</source>
-<target>Comparazione contenuto del file %x</target>
+<target>Confronto contenuto del file %x</target>
 
 <source>Generating file list...</source>
 <target>Generazione elenco file...</target>
 
+<source>Starting comparison</source>
+<target>Inizio confronto</target>
+
 <source>Calculating sync directions...</source>
 <target>Calcolo della direzione di sincronizzazione...</target>
 
@@ -206,16 +236,16 @@
 <target>Aggiorna attributi a destra</target>
 
 <source>Database file %x is incompatible.</source>
-<target>Il file database %x non è compatibile.</target>
+<target>Il file del database %x non è compatibile.</target>
 
 <source>Initial synchronization:</source>
 <target>Prima sincronizzazione:</target>
 
 <source>Database file %x does not yet exist.</source>
-<target>Il file database %x non è ancora stato creato.</target>
+<target>Il file del database %x non è ancora stato creato.</target>
 
 <source>Database file is corrupt:</source>
-<target>Il file database è corrotto:</target>
+<target>Il file del database è corrotto:</target>
 
 <source>Cannot write file %x.</source>
 <target>Impossibile scrivere il file %x.</target>
@@ -224,7 +254,7 @@
 <target>Impossibile leggere il file %x.</target>
 
 <source>Database files do not share a common session.</source>
-<target>I file database non condividono una sessione comune.</target>
+<target>I file del database non condividono una sessione comune.</target>
 
 <source>Searching for folder %x...</source>
 <target>Ricerca della cartella %x...</target>
@@ -259,15 +289,6 @@
 <source>Total time:</source>
 <target>Tempo totale:</target>
 
-<source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
-</source>
-<target>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Byte</pluralform>
-</target>
-
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -284,16 +305,7 @@
 <target>Impossibile impostare blocco cartella per %x.</target>
 
 <source>Scanning:</source>
-<target>Analisi di:</target>
-
-<source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
-</source>
-<target>
-<pluralform>[1 thread]</pluralform>
-<pluralform>[%x threads]</pluralform>
-</target>
+<target>Scansione di:</target>
 
 <source>Encoding extended time information: %x</source>
 <target>Codifica estesa informazioni orario: %x</target>
@@ -322,11 +334,11 @@
 <source>Cannot load file %x.</source>
 <target>Impossibile caricare il file %x.</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>Il nome volume %x non è parte del nome file %y.</target>
+<source>Cannot determine volume name for %x.</source>
+<target>Impossibile determinare nome del volume per %x.</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
-<target>Selezionata interruazione: conclusione dell'operazione...</target>
+<target>Richiesta interruazione: attendere conclusione dell'operazione...</target>
 
 <source>Failure to create timestamp for versioning:</source>
 <target>Errore nella creazione di data e ora per il controllo delle versioni:</target>
@@ -353,7 +365,7 @@
 <target>&Informazioni</target>
 
 <source>&Help</source>
-<target>&?</target>
+<target>&Aiuto</target>
 
 <source>Usage:</source>
 <target>Uso:</target>
@@ -365,7 +377,7 @@
 <target>2. Inserisci linea di comando.</target>
 
 <source>3. Press 'Start'.</source>
-<target>3. Premi 'Start'.</target>
+<target>3. Premi 'Avvio'.</target>
 
 <source>To get started just import a .ffs_batch file.</source>
 <target>Per iniziare è sufficiente importare un file con estensione .ffs_batch</target>
@@ -389,10 +401,7 @@
 <target>Tempo di attesa [secondi]</target>
 
 <source>Idle time between last detected change and execution of command</source>
-<target>Tempo di attesa tra ultimo cambiamento rilevato ed esecuzione dei comandi</target>
-
-<source>Command line</source>
-<target>Linea di comando</target>
+<target>Tempo di attesa tra ultimo cambiamento rilevato ed l'esecuzione del comando</target>
 
 <source>
 The command is triggered if:
@@ -415,10 +424,7 @@ Il comando è attivato se:
 <target>Annulla</target>
 
 <source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Sincronizzazione automatizzata</target>
-
-<source>Warning</source>
-<target>Attenzione</target>
+<target>SyncTempoReale - Sincronizzazione automatizzata</target>
 
 <source>Build: %x</source>
 <target>Versione: %x</target>
@@ -435,9 +441,6 @@ Il comando è attivato se:
 <source>&Exit</source>
 <target>&Esci</target>
 
-<source>Waiting for missing directories...</source>
-<target>In attesa delle cartelle mancanti...</target>
-
 <source>Invalid command line:</source>
 <target>Linea di comando non valida:</target>
 
@@ -447,14 +450,14 @@ Il comando è attivato se:
 <source>File time and size</source>
 <target>Ora e dimensione file</target>
 
-<source> Two way </source>
-<target> Due vie </target>
+<source>Two way</source>
+<target>Due vie</target>
 
 <source>Mirror</source>
-<target>Mirror </target>
+<target>Specchio</target>
 
 <source>Update</source>
-<target>Aggiorna </target>
+<target>Aggiorna</target>
 
 <source>Custom</source>
 <target>Personalizza</target>
@@ -510,12 +513,6 @@ Il comando è attivato se:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>I seguenti oggetti hanno conflitti irrisolti e non saranno sincronizzati:</target>
 
-<source>Significant difference detected:</source>
-<target>Riscontrate differenze significative:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>Piu' del 50% del totale dei file saranno copiati o cancellati.</target>
-
 <source>Not enough free disk space available in:</source>
 <target>Spazio libero su disco insufficiente in:</target>
 
@@ -523,10 +520,10 @@ Il comando è attivato se:
 <target>Richiesto:</target>
 
 <source>Available:</source>
-<target>Dispobilile:</target>
+<target>Disponibile:</target>
 
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
-<target>Verrà modificata una cartella che è parte di molteplici coppie di cartelle. Controlla le impostazioni di sincronizzazione.</target>
+<target>Verrà modificata una cartella che è parte di molte coppie di cartelle. Controlla le impostazioni di sincronizzazione.</target>
 
 <source>Synchronizing folder pair:</source>
 <target>Sincronizzazione della coppia di cartelle:</target>
@@ -537,6 +534,9 @@ Il comando è attivato se:
 <source>Creating Volume Shadow Copy for %x...</source>
 <target>Creazione di Volume Shadow Copy per %x...</target>
 
+<source>Data verification error: %x and %y have different content.</source>
+<target>Dati di verifica errore: %x e %y hanno un contenuto diverso.</target>
+
 <source>Synchronization aborted</source>
 <target>Sincronizzazione abortita</target>
 
@@ -558,12 +558,24 @@ Il comando è attivato se:
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
 <target>Premere "Passa" per risolvere i problemi nella finestra principale di FreeFileSync.</target>
 
+<source>Switching to FreeFileSync main dialog</source>
+<target>Passaggio alla finestra di dialogo principale FreeFileSync</target>
+
+<source>Retrying operation after error:</source>
+<target>Ripetere l'operazione dopo l'errore:</target>
+
 <source>A new version of FreeFileSync is available:</source>
 <target>E' disponibile una nuova versione di FreeFileSync:</target>
 
 <source>Download now?</source>
 <target>Scaricarla ora?</target>
 
+<source>New version found</source>
+<target>Nuova versione trovata</target>
+
+<source>&Download</source>
+<target>&Scaricare</target>
+
 <source>FreeFileSync is up to date.</source>
 <target>FreeFileSync è aggiornato.</target>
 
@@ -573,6 +585,9 @@ Il comando è attivato se:
 <source>Unable to connect to sourceforge.net.</source>
 <target>Impossibile collegarsi a sourceforge.net.</target>
 
+<source>Cannot find current FreeFileSync version number online. Do you want to check manually?</source>
+<target>Non riesci a trovare l'attuale numero di versione di FreeFileSync on-line . Vuoi controllare manualmente?</target>
+
 <source>Symlink</source>
 <target>Symlink</target>
 
@@ -675,12 +690,18 @@ Il comando è attivato se:
 <source>&Global settings...</source>
 <target>&Preferenze...</target>
 
+<source>&Tools</source>
+<target>&Strumenti</target>
+
 <source>&Check now</source>
 <target>&Controlla ora</target>
 
 <source>Check &automatically once a week</source>
 <target>Controlla &automaticamente una volta a settimana</target>
 
+<source>Check for new &version</source>
+<target>Verificare presenza nuove &versione</target>
+
 <source>Compare</source>
 <target>Compara</target>
 
@@ -747,6 +768,18 @@ Il comando è attivato se:
 <source>&Pause</source>
 <target>&Pausa</target>
 
+<source>Variant</source>
+<target>Variante</target>
+
+<source>Statistics</source>
+<target>Statistiche</target>
+
+<source>Don't show this dialog again</source>
+<target>Non mostrare più questo messaggio</target>
+
+<source>Select a variant</source>
+<target>Seleziona una variante</target>
+
 <source>
 Files are found equal if
      - last write time and date
@@ -775,7 +808,7 @@ I file sono considerati identici se
 <target>Gestione Collegamenti</target>
 
 <source>Help</source>
-<target>?</target>
+<target>Aiuto</target>
 
 <source>OK</source>
 <target>OK</target>
@@ -784,7 +817,7 @@ I file sono considerati identici se
 <target>Identifica e propaga cambiamenti su entrambi i lati. Cancellazioni, spostamenti e conflitti sono identificati automaticamente usando un database.</target>
 
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Backup mirror della cartella di sinistra. La cartella destra verrà modificata per corrispondere esattamente alla cartella di sinistra dopo la sincronizzazione.</target>
+<target>Backup a Specchio della cartella di sinistra. La cartella di destra verrà modificata per corrispondere esattamente alla cartella di sinistra dopo la sincronizzazione.</target>
 
 <source>Copy new or updated files to right folder.</source>
 <target>Copia file nuovi o aggiornati nella cartella di destra.</target>
@@ -814,7 +847,7 @@ I file sono considerati identici se
 <target>Permanente</target>
 
 <source>Delete or overwrite files permanently</source>
-<target>Elimina o sovrascrivi file definitivamente</target>
+<target>Elimina o sovrascrivi i file definitivamente</target>
 
 <source>Recycle Bin</source>
 <target>Cestino</target>
@@ -893,7 +926,7 @@ Only files that match all filter settings will be synchronized.
 Note: File names must be relative to base directories.
 </source>
 <target>
-Solo i file che corrispondono esattamente a tutti i filtri impostati verrranno sincronizzati.
+Solo i file che corrispondono esattamente a tutti i parametri dei filtri  verrranno sincronizzati.
 Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza.
 </target>
 
@@ -922,7 +955,7 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza.
 <target>Preferenze</target>
 
 <source>Fail-safe file copy</source>
-<target>Copia file sicura</target>
+<target>Copia file di fail-safe</target>
 
 <source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
 <target>Scrivi in un file temporaneo (*.ffs_tmp) prima di rinominarlo. Ciò garantisce uno stato consistente anche in caso di errore fatale.</target>
@@ -931,7 +964,7 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza.
 <target>Copia file bloccati</target>
 
 <source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Copia file condivisi o bloccati usando il Servizio Volume Shadow Copy (richiede diritti di amministarzione)</target>
+<target>Copia file condivisi o bloccati usando il Servizio Volume Shadow Copy (richiede diritti di amministratore)</target>
 
 <source>Copy file access permissions</source>
 <target>Copia permessi di accesso file</target>
@@ -951,15 +984,6 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza.
 <source>&Default</source>
 <target>&Predefinito</target>
 
-<source>Variant</source>
-<target>Variante</target>
-
-<source>Statistics</source>
-<target>Statistiche</target>
-
-<source>Don't show this dialog again</source>
-<target>Non mostrare più questo messaggio</target>
-
 <source>Find what:</source>
 <target>Trova questo:</target>
 
@@ -969,15 +993,15 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza.
 <source>&Find next</source>
 <target>&Trova successivo</target>
 
+<source>Start synchronization</source>
+<target>Avvia sincronizzazione</target>
+
 <source>Delete</source>
 <target>Elimina</target>
 
 <source>Configure filter</source>
 <target>Configurazione dei filtri</target>
 
-<source>Start synchronization</source>
-<target>Avvia sincronizzazione</target>
-
 <source>Find</source>
 <target>Trova</target>
 
@@ -1009,7 +1033,25 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza.
 <target>Salva</target>
 
 <source>Compare both sides</source>
-<target>Compara le due liste</target>
+<target>Confronta entrambi i lati</target>
+
+<source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>Vuoi veramente eseguire il comando %y  per 1 articolo?</pluralform>
+<pluralform>Vuoi veramente eseguire %y comando per %x articoli?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>Confermare</target>
+
+<source>&Execute</source>
+<target>&Esecuzione</target>
+
+<source>&Don't show this dialog again</source>
+<target>&Non mostrare più questo avviso</target>
 
 <source>
 <pluralform>1 directory</pluralform>
@@ -1029,6 +1071,15 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza.
 <pluralform>%x file</pluralform>
 </target>
 
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target>
+<pluralform>%y di 1 riga in vista</pluralform>
+<pluralform>%y di %x righe in vista</pluralform>
+</target>
+
 <source>Set direction:</source>
 <target>Imposta direzione:</target>
 
@@ -1099,10 +1150,10 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza.
 <target>Mostra file esistenti solo a destra</target>
 
 <source>Show files that are newer on left</source>
-<target>Mostra file di sinistra più recenti che a destra</target>
+<target>Mostra i file che sono più recenti sulla sinistra</target>
 
 <source>Show files that are newer on right</source>
-<target>Mostra file di destra più recenti che a sinistra</target>
+<target>Mostra i file che sono più recenti sulla destra</target>
 
 <source>Show files that are equal</source>
 <target>Mostra file identici</target>
@@ -1143,9 +1194,6 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza.
 <source>All folders are in sync</source>
 <target>Tutte le cartelle sono sincronizzate</target>
 
-<source>Comma separated list</source>
-<target>Elenco elementi separati da virgola</target>
-
 <source>File list exported</source>
 <target>Elenco file esportato</target>
 
@@ -1197,14 +1245,8 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza.
 <source>Completed</source>
 <target>Completato</target>
 
-<source>Continue</source>
-<target>Continua</target>
-
-<source>Pause</source>
-<target>Pausa</target>
-
-<source>Logging</source>
-<target>Registo attività</target>
+<source>&Continue</source>
+<target>&Continuare</target>
 
 <source>Cannot find %x</source>
 <target>Impossibile trovare %x</target>
@@ -1276,13 +1318,13 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza.
 <target>- solo porzione cartella</target>
 
 <source>- Other side's counterpart to %item_path%</source>
-<target>- Controparte sull'altro lato a %item_path%</target>
+<target>- Omologo dell'altro lato a %item_path%</target>
 
 <source>- Other side's counterpart to %item_folder%</source>
-<target>- Controparte sull'altro lato a %item_folder%</target>
+<target>- Omologo dell'altro lato a %item_folder%</target>
 
 <source>Make hidden warnings and dialogs visible again?</source>
-<target>Vuoi visualizzare nuovamente i dialoghi e avvisi nascosti?</target>
+<target>Vuoi visualizzare nuovamente i dialoghi e gli avvisi nascosti?</target>
 
 <source>Leave as unresolved conflict</source>
 <target>Lascia come conflitti irrisolti</target>
@@ -1299,9 +1341,6 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza.
 <source>Append a timestamp to each file name</source>
 <target>Accoda data e ora ad ogni nome di file</target>
 
-<source>Folder</source>
-<target>Cartella</target>
-
 <source>File</source>
 <target>File</target>
 
@@ -1311,6 +1350,9 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza.
 <source>Files</source>
 <target>File</target>
 
+<source>Items</source>
+<target>Articoli</target>
+
 <source>Percentage</source>
 <target>Percentuale</target>
 
@@ -1353,8 +1395,11 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza.
 <source>Cannot create directory %x.</source>
 <target>Impossibile creare cartella %x.</target>
 
+<source>Cannot create symbolic link %x.</source>
+<target>Impossibile creare il collegamento %x.</target>
+
 <source>Cannot find system function %x.</source>
-<target>Impossibile trovare funzione di sistema %x.</target>
+<target>Impossibile trovare la funzione di sistema %x.</target>
 
 <source>Cannot copy file %x to %y.</source>
 <target>Impossibile copiare file %x in %y.</target>
@@ -1404,6 +1449,9 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza.
 <pluralform>%x giorni</pluralform>
 </target>
 
+<source>Failed to register to receive system messages.</source>
+<target>Impossibile registrarsi per ricevere i messaggi di sistema.</target>
+
 <source>Cannot set privilege %x.</source>
 <target>Impossibile impostare privilegi %x.</target>
 
@@ -1416,6 +1464,9 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza.
 <source>Unable to move %x to the Recycle Bin.</source>
 <target>Impossibile spostare %x nel Cestino.</target>
 
+<source>Cannot determine final path for %x.</source>
+<target>Impossibile determinare il percorso finale per %x.</target>
+
 <source>Error Code %x:</source>
 <target>Errore Codice %x:</target>
 
diff --git a/BUILD/Languages/lithuanian.lng b/BUILD/Languages/lithuanian.lng
index 0c4cc9b9..e3bfed10 100644
--- a/BUILD/Languages/lithuanian.lng
+++ b/BUILD/Languages/lithuanian.lng
@@ -22,15 +22,42 @@
 <source>Items</source>
 <target></target>
 
+<source>Log</source>
+<target></target>
+
+<source>&Continue</source>
+<target></target>
+
+<source>Comma-separated values</source>
+<target></target>
+
 <source>
 <pluralform>%y of 1 row in view</pluralform>
 <pluralform>%y of %x rows in view</pluralform>
 </source>
 <target></target>
 
+<source>&Don't show this dialog again</source>
+<target></target>
+
+<source>&Execute</source>
+<target></target>
+
+<source>Confirm</source>
+<target></target>
+
+<source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target></target>
+
 <source>Select a variant</source>
 <target></target>
 
+<source>Minimize to notification area</source>
+<target></target>
+
 <source>Check for new &version</source>
 <target></target>
 
@@ -46,15 +73,48 @@
 <source>New version found</source>
 <target></target>
 
+<source>Retrying operation after error:</source>
+<target></target>
+
 <source>Switching to FreeFileSync main dialog</source>
 <target></target>
 
 <source>Data verification error: %x and %y have different content.</source>
 <target></target>
 
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target></target>
+
+<source>&Show error</source>
+<target></target>
+
+<source>Waiting until all directories are available...</source>
+<target></target>
+
+<source>Directory monitoring active</source>
+<target></target>
+
+<source>Volume name %x is not part of file path %y.</source>
+<target></target>
+
 <source>Cannot determine volume name for %x.</source>
 <target></target>
 
+<source>%x items</source>
+<target></target>
+
+<source>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
+</source>
+<target></target>
+
+<source>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
+</source>
+<target></target>
+
 <source>Cannot read file attributes of %x.</source>
 <target></target>
 
@@ -70,6 +130,39 @@
 <source>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
 <target></target>
 
+<source>Any number of alternative directories for at most one config file.</source>
+<target></target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target></target>
+
+<source>directory</source>
+<target></target>
+
+<source>config files</source>
+<target></target>
+
+<source>Syntax:</source>
+<target></target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target></target>
+
+<source>The config file must not contain settings at folder pair level when directories are set via command line.</source>
+<target></target>
+
+<source>Unequal number of left and right directories specified.</source>
+<target></target>
+
+<source>Cannot open file %x.</source>
+<target></target>
+
+<source>Syntax error</source>
+<target></target>
+
+<source>A directory path is expected after %x.</source>
+<target></target>
+
 <source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
 <target></target>
 
@@ -112,15 +205,18 @@
 <source>An exception occurred</source>
 <target>Atsirado išimtis</target>
 
-<source>Cannot find file %x.</source>
-<target>Nepavyksta rasti failo %x.</target>
-
 <source>Error</source>
 <target>Klaida</target>
 
 <source>File %x does not contain a valid configuration.</source>
 <target>Failas %x neturi tinkamų nustatymų.</target>
 
+<source>Warning</source>
+<target>Perspėjimas</target>
+
+<source>Command line</source>
+<target>Komandinė eilutė</target>
+
 <source>A folder input field is empty.</source>
 <target>Aplanko įvesties laukas yra tuščias.</target>
 
@@ -264,17 +360,6 @@
 <source>Total time:</source>
 <target>Visas laikas:</target>
 
-<source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
-</source>
-<target>
-<pluralform>1 Baitas</pluralform>
-<pluralform>%x Baitai</pluralform>
-<pluralform>%x Baitų</pluralform>
-<pluralform>%x Baitas</pluralform>
-</target>
-
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -293,17 +378,6 @@
 <source>Scanning:</source>
 <target>Skenuojama:</target>
 
-<source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
-</source>
-<target>
-<pluralform>[1 Grėsmė]</pluralform>
-<pluralform>[%x Grėsmės]</pluralform>
-<pluralform>[%x Grėsmių]</pluralform>
-<pluralform>[%x Grėsmė]</pluralform>
-</target>
-
 <source>Encoding extended time information: %x</source>
 <target>Koduojama išplėstinė laiko informacija: %x</target>
 
@@ -331,9 +405,6 @@
 <source>Cannot load file %x.</source>
 <target>Nepavyksta įkelti failo %x.</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>Tomo pavadinimas %x nėra dalis failo pavadinimo %y.</target>
-
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Nutraukti: laukiama kol baigsis esama operacija...</target>
 
@@ -400,9 +471,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>Neveiklus laikas tarp paskutinio aptikto pokyčio ir komandos įvykdymo</target>
 
-<source>Command line</source>
-<target>Komandinė eilutė</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -426,9 +494,6 @@ Komanda inicijuojama jei:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatizuotas sinchronizavimas</target>
 
-<source>Warning</source>
-<target>Perspėjimas</target>
-
 <source>Build: %x</source>
 <target>Versija: %x</target>
 
@@ -444,9 +509,6 @@ Komanda inicijuojama jei:
 <source>&Exit</source>
 <target>&Išeiti</target>
 
-<source>Waiting for missing directories...</source>
-<target>Laikiama trūkstamų katalogų...</target>
-
 <source>Invalid command line:</source>
 <target>Netinkama komandinė eilutė:</target>
 
@@ -456,14 +518,14 @@ Komanda inicijuojama jei:
 <source>File time and size</source>
 <target>Failo laiką ir dydį</target>
 
-<source> Two way </source>
-<target> Dvipusis </target>
+<source>Two way</source>
+<target>Dvipusis</target>
 
 <source>Mirror</source>
-<target>Veidrodis </target>
+<target>Veidrodis</target>
 
 <source>Update</source>
-<target>Atnaujinti </target>
+<target>Atnaujinti</target>
 
 <source>Custom</source>
 <target>Savitas</target>
@@ -519,12 +581,6 @@ Komanda inicijuojama jei:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>Šie elementai turi neišspręstų konfliktų ir nebus sinchronizuoti:</target>
 
-<source>Significant difference detected:</source>
-<target>Žymus skirtumas nustatytas:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>Daugiau nei 50% failų bus nukopijuota arba ištrinta.</target>
-
 <source>Not enough free disk space available in:</source>
 <target>Nepakanka laisvos disko vietos:</target>
 
@@ -756,6 +812,15 @@ Komanda inicijuojama jei:
 <source>&Pause</source>
 <target>&Pauzė</target>
 
+<source>Variant</source>
+<target>Variantas</target>
+
+<source>Statistics</source>
+<target>Statistika</target>
+
+<source>Don't show this dialog again</source>
+<target>Daugiau nerodyti šio dialogo</target>
+
 <source>
 Files are found equal if
      - last write time and date
@@ -960,15 +1025,6 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus.
 <source>&Default</source>
 <target>&Numatyta</target>
 
-<source>Variant</source>
-<target>Variantas</target>
-
-<source>Statistics</source>
-<target>Statistika</target>
-
-<source>Don't show this dialog again</source>
-<target>Daugiau nerodyti šio dialogo</target>
-
 <source>Find what:</source>
 <target>Rasti kas:</target>
 
@@ -978,15 +1034,15 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus.
 <source>&Find next</source>
 <target>&Rasti kitą</target>
 
+<source>Start synchronization</source>
+<target>Pradėti sinchronizavimą</target>
+
 <source>Delete</source>
 <target>Trinti</target>
 
 <source>Configure filter</source>
 <target>Nustatyti filtrą</target>
 
-<source>Start synchronization</source>
-<target>Pradėti sinchronizavimą</target>
-
 <source>Find</source>
 <target>Rasti</target>
 
@@ -1156,9 +1212,6 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus.
 <source>All folders are in sync</source>
 <target>Visi aplankai susinchronizuoti</target>
 
-<source>Comma separated list</source>
-<target>Kableliais atksirtas sąrašas</target>
-
 <source>File list exported</source>
 <target>Failų sąrašas eksportuotas</target>
 
@@ -1210,15 +1263,6 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus.
 <source>Completed</source>
 <target>Baigta</target>
 
-<source>Continue</source>
-<target>Tęsti</target>
-
-<source>Pause</source>
-<target>Pristabdyti</target>
-
-<source>Logging</source>
-<target>Užduoties duomenys</target>
-
 <source>Cannot find %x</source>
 <target>Nepavyksta rasti %x</target>
 
@@ -1316,9 +1360,6 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus.
 <source>Append a timestamp to each file name</source>
 <target>Pridėti laiko žymę kiekvieno failo pavadinime</target>
 
-<source>Folder</source>
-<target>Aplankas</target>
-
 <source>File</source>
 <target>Failas</target>
 
diff --git a/BUILD/Languages/slovenian.lng b/BUILD/Languages/slovenian.lng
index e368737c..a5bed20e 100644
--- a/BUILD/Languages/slovenian.lng
+++ b/BUILD/Languages/slovenian.lng
@@ -7,9 +7,99 @@
 	<plural_definition>n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3</plural_definition>
 </header>
 
+<source>Log</source>
+<target></target>
+
+<source>&Continue</source>
+<target></target>
+
+<source>Comma-separated values</source>
+<target></target>
+
+<source>&Don't show this dialog again</source>
+<target></target>
+
+<source>&Execute</source>
+<target></target>
+
+<source>Confirm</source>
+<target></target>
+
+<source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target></target>
+
+<source>Minimize to notification area</source>
+<target></target>
+
 <source>Retrying operation after error:</source>
 <target></target>
 
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target></target>
+
+<source>&Show error</source>
+<target></target>
+
+<source>Waiting until all directories are available...</source>
+<target></target>
+
+<source>Directory monitoring active</source>
+<target></target>
+
+<source>Volume name %x is not part of file path %y.</source>
+<target></target>
+
+<source>%x items</source>
+<target></target>
+
+<source>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
+</source>
+<target></target>
+
+<source>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
+</source>
+<target></target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target></target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target></target>
+
+<source>directory</source>
+<target></target>
+
+<source>config files</source>
+<target></target>
+
+<source>Syntax:</source>
+<target></target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target></target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target></target>
+
+<source>Unequal number of left and right directories specified.</source>
+<target></target>
+
+<source>Cannot open file %x.</source>
+<target></target>
+
+<source>Syntax error</source>
+<target></target>
+
+<source>A directory path is expected after %x.</source>
+<target></target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>Obe strani sta se spremenili od zadnje sinhronizacije.</target>
 
@@ -52,15 +142,18 @@
 <source>An exception occurred</source>
 <target>Zgodila se je napaka</target>
 
-<source>Cannot find file %x.</source>
-<target>Ne morem najti datoteke %x.</target>
-
 <source>Error</source>
 <target>Napaka</target>
 
 <source>File %x does not contain a valid configuration.</source>
 <target>Datoteka %x ne vsebuje veljavnih nastavitev</target>
 
+<source>Warning</source>
+<target>Pozor</target>
+
+<source>Command line</source>
+<target>Ukazna vrstica</target>
+
 <source>A folder input field is empty.</source>
 <target>Vnosno polje za mapo je prazno.</target>
 
@@ -219,17 +312,6 @@
 <source>Total time:</source>
 <target>Celoten čas:</target>
 
-<source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
-</source>
-<target>
-<pluralform>%x Bajt</pluralform>
-<pluralform>%x Bajta</pluralform>
-<pluralform>%x Bajti</pluralform>
-<pluralform>%x Bajtov</pluralform>
-</target>
-
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -248,17 +330,6 @@
 <source>Scanning:</source>
 <target>Pregledujem:</target>
 
-<source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
-</source>
-<target>
-<pluralform>[%x nit]</pluralform>
-<pluralform>[%x niti]</pluralform>
-<pluralform>[%x niti]</pluralform>
-<pluralform>[%x niti]</pluralform>
-</target>
-
 <source>Encoding extended time information: %x</source>
 <target>Podrobne informacije o času enkodiranja: %x</target>
 
@@ -289,9 +360,6 @@
 <source>Cannot determine volume name for %x.</source>
 <target>Ne morem določiti ime nosilca za %x.</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>Ime nosilca %x ni del imena datoteke %y.</target>
-
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Zahtevana je bila prekinitev: čakam, da se zaključi trenutna operacija...</target>
 
@@ -358,9 +426,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>Čas nedejavnosti med zadnjo zaznano spremembo in izvršitvijo ukaza</target>
 
-<source>Command line</source>
-<target>Ukazna vrstica</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -384,9 +449,6 @@ Ukaz se sproži če:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Avtomatizirana sinhronizacija</target>
 
-<source>Warning</source>
-<target>Pozor</target>
-
 <source>Build: %x</source>
 <target>Izgradnja: %x</target>
 
@@ -402,9 +464,6 @@ Ukaz se sproži če:
 <source>&Exit</source>
 <target>&Izhod</target>
 
-<source>Waiting for missing directories...</source>
-<target>Čakam na manjkajoče imenike...</target>
-
 <source>Invalid command line:</source>
 <target>Napačna ukazna vrstica:</target>
 
@@ -414,14 +473,14 @@ Ukaz se sproži če:
 <source>File time and size</source>
 <target>Čas in velikost datoteke</target>
 
-<source> Two way </source>
-<target> Obojesmerno </target>
+<source>Two way</source>
+<target>Obojesmerno</target>
 
 <source>Mirror</source>
-<target>Zrcalno </target>
+<target>Zrcalno</target>
 
 <source>Update</source>
-<target>Posodobi </target>
+<target>Posodobi</target>
 
 <source>Custom</source>
 <target>Po meri</target>
@@ -477,12 +536,6 @@ Ukaz se sproži če:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>Naslednji elementi imajo nerešene konflikte in ne bodo sinhronizirani:</target>
 
-<source>Significant difference detected:</source>
-<target>Zaznana je pomembna razlika:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>Več kot 50% od celotnega števila datotek bo kopiranih ali izbrisanih.</target>
-
 <source>Not enough free disk space available in:</source>
 <target>Na voljo ni dovolj prostega prostora na disku v:</target>
 
@@ -735,6 +788,15 @@ Ukaz se sproži če:
 <source>&Pause</source>
 <target>&Premor</target>
 
+<source>Variant</source>
+<target>Različica</target>
+
+<source>Statistics</source>
+<target>Statistika</target>
+
+<source>Don't show this dialog again</source>
+<target>Ne prikazuj več tega pogovora</target>
+
 <source>Select a variant</source>
 <target>Izberite spremenljivko</target>
 
@@ -942,15 +1004,6 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom.
 <source>&Default</source>
 <target>&Privzeto</target>
 
-<source>Variant</source>
-<target>Različica</target>
-
-<source>Statistics</source>
-<target>Statistika</target>
-
-<source>Don't show this dialog again</source>
-<target>Ne prikazuj več tega pogovora</target>
-
 <source>Find what:</source>
 <target>Najdi kaj</target>
 
@@ -960,15 +1013,15 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom.
 <source>&Find next</source>
 <target>&Najdi naslednje</target>
 
+<source>Start synchronization</source>
+<target>Začni sinhronizacijo</target>
+
 <source>Delete</source>
 <target>Izbriši</target>
 
 <source>Configure filter</source>
 <target>Konfiguriraj filter</target>
 
-<source>Start synchronization</source>
-<target>Začni sinhronizacijo</target>
-
 <source>Find</source>
 <target>Najdi</target>
 
@@ -1149,9 +1202,6 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom.
 <source>All folders are in sync</source>
 <target>Vse mape so sinhronizirane</target>
 
-<source>Comma separated list</source>
-<target>Seznam ločen z vejico</target>
-
 <source>File list exported</source>
 <target>Seznam datotek je bil izvožen</target>
 
@@ -1203,15 +1253,6 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom.
 <source>Completed</source>
 <target>Zaključeno</target>
 
-<source>Continue</source>
-<target>Nadaljuj</target>
-
-<source>Pause</source>
-<target>Premor</target>
-
-<source>Logging</source>
-<target>Beleženje</target>
-
 <source>Cannot find %x</source>
 <target>Ne najdem %x</target>
 
@@ -1309,9 +1350,6 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom.
 <source>Append a timestamp to each file name</source>
 <target>Dodaj časovno oznako k vsakemu imenu datoteke</target>
 
-<source>Folder</source>
-<target>Mapa</target>
-
 <source>File</source>
 <target>Datoteka</target>
 
diff --git a/BUILD/Languages/spanish.lng b/BUILD/Languages/spanish.lng
index 6f48fdd6..e1726b2b 100644
--- a/BUILD/Languages/spanish.lng
+++ b/BUILD/Languages/spanish.lng
@@ -7,6 +7,99 @@
 	<plural_definition>n == 1 ? 0 : 1</plural_definition>
 </header>
 
+<source>Log</source>
+<target></target>
+
+<source>&Continue</source>
+<target></target>
+
+<source>Comma-separated values</source>
+<target></target>
+
+<source>&Don't show this dialog again</source>
+<target></target>
+
+<source>&Execute</source>
+<target></target>
+
+<source>Confirm</source>
+<target></target>
+
+<source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target></target>
+
+<source>Minimize to notification area</source>
+<target></target>
+
+<source>Retrying operation after error:</source>
+<target></target>
+
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target></target>
+
+<source>&Show error</source>
+<target></target>
+
+<source>Waiting until all directories are available...</source>
+<target></target>
+
+<source>Directory monitoring active</source>
+<target></target>
+
+<source>Volume name %x is not part of file path %y.</source>
+<target></target>
+
+<source>%x items</source>
+<target></target>
+
+<source>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
+</source>
+<target></target>
+
+<source>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
+</source>
+<target></target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target></target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target></target>
+
+<source>directory</source>
+<target></target>
+
+<source>config files</source>
+<target></target>
+
+<source>Syntax:</source>
+<target></target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target></target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target></target>
+
+<source>Unequal number of left and right directories specified.</source>
+<target></target>
+
+<source>Cannot open file %x.</source>
+<target></target>
+
+<source>Syntax error</source>
+<target></target>
+
+<source>A directory path is expected after %x.</source>
+<target></target>
+
 <source>Both sides have changed since last synchronization.</source>
 <target>Ambos lados han cambiado desde la última sincronización.</target>
 
@@ -49,15 +142,18 @@
 <source>An exception occurred</source>
 <target>Ha ocurrido una excepción</target>
 
-<source>Cannot find file %x.</source>
-<target>No se puede encontrar el archivo %x.</target>
-
 <source>Error</source>
 <target>Error</target>
 
 <source>File %x does not contain a valid configuration.</source>
 <target>El archivo %x no contiene una configuración válida.</target>
 
+<source>Warning</source>
+<target>Atención</target>
+
+<source>Command line</source>
+<target>Línea de comandos</target>
+
 <source>A folder input field is empty.</source>
 <target>Un campo de entrada de la carpeta está vacío.</target>
 
@@ -214,15 +310,6 @@
 <source>Total time:</source>
 <target>Tiempo total:</target>
 
-<source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
-</source>
-<target>
-<pluralform>1 byte</pluralform>
-<pluralform>%x bytes</pluralform>
-</target>
-
 <source>%x MB</source>
 <target>%x MB</target>
 
@@ -241,15 +328,6 @@
 <source>Scanning:</source>
 <target>Escanear:</target>
 
-<source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
-</source>
-<target>
-<pluralform>[1 hilo]</pluralform>
-<pluralform>[%x hilos]</pluralform>
-</target>
-
 <source>Encoding extended time information: %x</source>
 <target>Condificando información de hora extendida: %x</target>
 
@@ -280,9 +358,6 @@
 <source>Cannot determine volume name for %x.</source>
 <target>No se puede determinar nombre del volumen de %x.</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>El nombre de volumen %x no es parte del nombre de archivo %y.</target>
-
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Anulación solicitada: esperando a que la operación actual finalice…</target>
 
@@ -349,9 +424,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>Tiempo ocioso entre el último cambio detectado y la ejecución del comando</target>
 
-<source>Command line</source>
-<target>Línea de comandos</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -375,9 +447,6 @@ El comando es disparado si::
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Sincronización Automática</target>
 
-<source>Warning</source>
-<target>Atención</target>
-
 <source>Build: %x</source>
 <target>Completado: %x</target>
 
@@ -393,9 +462,6 @@ El comando es disparado si::
 <source>&Exit</source>
 <target>&Salir</target>
 
-<source>Waiting for missing directories...</source>
-<target>Esperando directorios faltantes…</target>
-
 <source>Invalid command line:</source>
 <target>Línea de comandos errónea:</target>
 
@@ -405,14 +471,14 @@ El comando es disparado si::
 <source>File time and size</source>
 <target>Fecha y tamaño del archivo</target>
 
-<source> Two way </source>
-<target> Dos formas </target>
+<source>Two way</source>
+<target>Dos formas</target>
 
 <source>Mirror</source>
-<target>Espejo </target>
+<target>Espejo</target>
 
 <source>Update</source>
-<target>Actualizar </target>
+<target>Actualizar</target>
 
 <source>Custom</source>
 <target>Personalizado</target>
@@ -468,12 +534,6 @@ El comando es disparado si::
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>Los siguientes elementos tienen conflictos sin resolver y no serán sincronizados:</target>
 
-<source>Significant difference detected:</source>
-<target>Diferencia significante detectada:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>Más del 50% del número total de archivos serán copiados o eliminados.</target>
-
 <source>Not enough free disk space available in:</source>
 <target>Espacio en disco insuficiente en:</target>
 
@@ -726,6 +786,15 @@ El comando es disparado si::
 <source>&Pause</source>
 <target>&Pausa</target>
 
+<source>Variant</source>
+<target>Tipo</target>
+
+<source>Statistics</source>
+<target>Estadísticas</target>
+
+<source>Don't show this dialog again</source>
+<target>No volver a mostrar este diálogo</target>
+
 <source>Select a variant</source>
 <target>Seleccione una variante</target>
 
@@ -933,15 +1002,6 @@ Aviso: Los nombres de archivos deben ser relativos a los directorios base.
 <source>&Default</source>
 <target>&Configuración predeterminada</target>
 
-<source>Variant</source>
-<target>Tipo</target>
-
-<source>Statistics</source>
-<target>Estadísticas</target>
-
-<source>Don't show this dialog again</source>
-<target>No volver a mostrar este diálogo</target>
-
 <source>Find what:</source>
 <target>Buscar:</target>
 
@@ -951,15 +1011,15 @@ Aviso: Los nombres de archivos deben ser relativos a los directorios base.
 <source>&Find next</source>
 <target>&Buscar siguiente</target>
 
+<source>Start synchronization</source>
+<target>Iniciar sincronización</target>
+
 <source>Delete</source>
 <target>Eliminar</target>
 
 <source>Configure filter</source>
 <target>Configurar filtro</target>
 
-<source>Start synchronization</source>
-<target>Iniciar sincronización</target>
-
 <source>Find</source>
 <target>Buscar</target>
 
@@ -1134,9 +1194,6 @@ Aviso: Los nombres de archivos deben ser relativos a los directorios base.
 <source>All folders are in sync</source>
 <target>Todas las carpetas están sincronizadas</target>
 
-<source>Comma separated list</source>
-<target>Lista separada por comas</target>
-
 <source>File list exported</source>
 <target>Lista de archivos exportada</target>
 
@@ -1188,15 +1245,6 @@ Aviso: Los nombres de archivos deben ser relativos a los directorios base.
 <source>Completed</source>
 <target>Terminado</target>
 
-<source>Continue</source>
-<target>Continuar</target>
-
-<source>Pause</source>
-<target>Pausa</target>
-
-<source>Logging</source>
-<target>Registro</target>
-
 <source>Cannot find %x</source>
 <target>No se puede encontrar %x</target>
 
@@ -1290,9 +1338,6 @@ Aviso: Los nombres de archivos deben ser relativos a los directorios base.
 <source>Append a timestamp to each file name</source>
 <target>Incluir fecha y hora a cada nombre de archivo</target>
 
-<source>Folder</source>
-<target>Carpeta</target>
-
 <source>File</source>
 <target>Archivo</target>