7 files changed, 487 insertions, 207 deletions
diff --git a/Languages/dutch.lng b/Languages/dutch.lng
index a731bb32..227f6cad 100644
--- a/Languages/dutch.lng
+++ b/Languages/dutch.lng
@@ -28,8 +28,8 @@
 &Informatie...
 &Advanced
 &Geavanceerd
-&Back
-&Terug
+&Apply
+&Toepassen
 &Cancel
 &Annuleren
 &Compare
@@ -42,12 +42,16 @@
 &Exporteer bestandslijst
 &File
 &Bestand
+&Global settings
+&Algemene instellingen
 &Help
 &Help
 &Ignore
 &Negeren
 &Language
 &Taal
+&Load
+&Laden
 &Load configuration
 &Laad de configuratie
 &OK
@@ -56,12 +60,14 @@
 &Pause
 &Quit
 &Afsluiten
-&Resolve
-&Oplossen
 &Retry
 &Opnieuw proberen
+&Save
+&Opslaan
 &Start
 &Start
+&Synchronize...
+&Synchroniseer...
 ,
 .
 - different
@@ -108,6 +114,8 @@
 <<	linker bestand is nieuwer\n
 <Directory>
 <Pad>
+<Last session>
+<Laatste sessie>
 <multiple selection>
 <veelvoudige selectie>
 <|	file on left side only\n
@@ -126,6 +134,8 @@ About
 Informatie
 Action
 Actie
+Active for FAT/FAT32 drives only: When comparing filetimes treat files that differ by less or equal than 1 hour as equal. This ensures daylight saving time switches are handled properly.
+Aleen van toepassing voor FAT/FAT32-schijven: wanneer bestandstijden worden vergeleken, de bestanden die verschillen met 1 of minder dan 1 uur als gelijk behandelen. Dit zorgt ervoor dat zomertijd veranderingen juist worden afgehandeld.
 Add folder pair
 Voeg 1 paar gekoppelde mappen toe
 All items have been synchronized!
@@ -136,14 +146,22 @@ As a result the files are separated into the following categories:
 Hierdoor worden de bestanden gescheiden in de volgende categorieën:
 As the name suggests, two files which share the same name are marked as equal if and only if they have the same content. This option is useful for consistency checks rather than backup operations. Therefore the file times are not taken into account at all.\n\nWith this option enabled the decision tree is smaller:
 Zoals de naam suggereert, worden twee bestanden met dezelfde naam alleen gemarkeerd als gelijk, als ze precies dezelfde inhoud hebben. Deze optie is handig voor een consistentiecontrole in plaats van back-up handelingen. Daarom worden de tijdstempels niet bekeken.\n\n Met deze optie aan is de beslissingsboom korter:
-Assemble a batch file with the following settings. To start synchronization in batch mode simply execute this file or schedule it in your operating system's task planner.
-Creëer een batchbestand met de volgende instellingen. Om synchronisatie\nin batchmodus uit te voeren kunt u dit bestand uitvoeren of opnemen in de taakplanner van het systeem.
+Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.
+Assembleer een batchbestand voor automatische synchronisatie. Om te starten in batchmodus is het voldoende om de bestandsnaam achter de FreeFileSync toepassing te zetten: FreeFileSync.exe <batchbestand>. Het is mogelijk dit in te plannen in de systeemplanner.
+Batch execution
+Batch taak uitvoeren
 Batch file created successfully!
 Batchbestand is succesvol aangemaakt!
+Batch job
+Batch taak
 Big thanks for localizing FreeFileSync goes out to:
 Extra dank voor het vertalen van FreeFileSync gaat naar:
 Build:
 Gebouwd:
+Cancel
+Annuleren
+Check all
+Alles controleren
 Choose to hide filtered files/directories from list
 Gefilterde bestanden niet/wel weergeven
 Comma separated list
@@ -180,8 +198,6 @@ Configure your own synchronization rules.
 Configureer uw eigen synchronisatieregels.
 Confirm
 Bevestig
-Consider this when setting up synchronization rules: You might want to avoid write access to these directories so that synchronization of both does not interfere.
-Neem het volgende in overweging: U wilt misschien schrijfrechten op deze paden vermijden, zodat synchronisatie van bijde elkaar niet hindert.
 Continue
 Doorgaan
 Conversion error:
@@ -216,6 +232,8 @@ Current operation:
 Huidige operatie:
 Custom
 Gebruik
+Customize columns
+Aanpassen kolommen
 DECISION TREE
 BESLISSINGSBOOM
 Data remaining:
@@ -230,14 +248,18 @@ Delete files/folders existing on right side only
 Verwijder bestanden/folders die alleen rechts bestaan
 Delete files\tDEL
 Verwijder bestanden\tDEL
+Delete on both sides
+Verwijder aan beide kanten
+Delete on both sides even if the file is selected on one side only
+Verwijder aan beide kanten ookal is het bestand maar aan één kant geselecteerd
 Delete:
 Verwijderen:
 Deleting file %x
 Bestand %x wordt verwijderd
 Deleting folder %x
 Map %x wordt verwijderd
-Directories are dependent:
-De volgende paden zijn afhankelijk van elkaar:
+Directories are dependent! Be careful when setting up synchronization rules:
+Mappen zijn afhankelijk van elkaar! Wees voorzichtig met het maken van synchronisatieregels:
 Directory does not exist:
 Map bestaat niet:
 Do not show graphical status and error messages but write to a logfile instead
@@ -248,8 +270,8 @@ Do nothing
 Geen actie ondernemen
 Do you really want to delete the following objects(s)?
 Weet u zeker dat u de volgende bestanden wilt verwijderen?
-Do you really want to move the following objects(s) to the recycle bin?
-Weet u zeker dat u de volgende bestanden naar de prullenbak wilt verplaatsen?
+Do you really want to move the following objects(s) to the Recycle Bin?
+Weet u zeker dat u de/het volgende bestand(en) wilt verplaatsen naar de prullenbak?
 Donate with PayPal
 Doneer met PayPal
 Drag && drop
@@ -268,24 +290,42 @@ Error deleting directory:
 Er is een fout opgetreden bij het verwijderen van pad:
 Error deleting file:
 Er is een fout opgetreden bij het verwijderen van bestand:
-Error moving to recycle bin:
-Er is een fout opgetreden bij verwijderen naar de prullenbak:
+Error handling
+Fout afhandeling
+Error moving to Recycle Bin:
+Er is een fout opgetreden bij het verplaatsen naar de prullenbak:
 Error parsing configuration file:
 Er is een fout opgetreden bij het aanmaken van configuratiebestand:
 Error reading file:
 Er is een fout opgetreden bij het lezen van het bestand:
+Error reading folder attributes:
+Er is een fout opgetreden bij het lezen van de map-eigenschappen:
 Error traversing directory:
 Er is een fout opgetreden bij het doorzoeken van map:
 Error writing file:
 Er is een fout opgetreden bij het schrijven naar bestand:
+Error writing folder attributes:
+Er is een fout opgetreden bij het schrijven van de map-eigenschappen:
 Error: Source directory does not exist anymore:
 Er is een fout opgetreden. De oorspronkelijke map bestaat niet meer:
 Example
 Voorbeeld
 Exclude
 Uitsluiten
+Exclude temporarily
+Tijdelijk uitsluiten
+Exclude via filter:
+Uitsluiten door filter:
+Exit immediately and set returncode < 0
+Onmiddelijk afsluiten en zet de returncode < 0
+Exit with RC < 0
+Afsluiten met RC < 0
+FAT32: Handle Daylight Saving Time
+FAT32: Gebruik zomertijd
 Feedback and suggestions are welcome at:
 Tips en suggesties zijn welkom op:
+File Manager integration:
+Integratie bestandsbeheer:
 File already exists. Overwrite?
 Het bestand bestaat al. Overschrijven?
 File content
@@ -318,14 +358,14 @@ Files/folders that exist on left side only
 Bestanden/mappen die alleen aan de linkerkant bestaan
 Files/folders that exist on right side only
 Bestanden/mappen die alleen aan de rechterkant bestaan
-Filter
-Filter
 Filter active: Press again to deactivate
 Filter actief: nogmaals klikken om uit te zetten
 Filter files
 Filter bestanden
 Filter view
 Bekijk het filter
+Folder Comparison and Synchronization
+Mappen vergelijken en synchroniseren
 Folder pair
 Gekoppelde mappen
 FreeFileSync - Folder Comparison and Synchronization
@@ -338,8 +378,16 @@ FreeFileSync batch file
 FreeFileSync batchbestand
 FreeFileSync configuration
 FreeFileSync configuratie
+Full name
+Volledige naam
+Generating file list...
+Bestandslijst genereren...
+Global settings
+Algemene instellingen
 Help
 Help
+Hide all error and warning messages
+Verberg alle foutmeldingen en waarschuwingen
 Hide files that are different
 Verberg bestanden die verschillend zijn
 Hide files that are equal
@@ -366,22 +414,22 @@ If you like FFS:
 Als het programma u bevalt:
 Ignore errors
 Negeer foutmeldingen
-Ignore next errors
-Negeer volgende foutmeldingen
+Ignore subsequent errors
+Negeer verdere foutmeldingen
 Ignore this error, retry or abort synchronization?
 Negeer deze fout, opnieuw proberen of afbreken van deze synchronisatie?
 Ignore this error, retry or abort?
 Negeer deze fout, opnieuw proberen of de handeling afbreken?
 Include
 Gebruiken
+Include temporarily
+Tijdelijk bijsluiten
 Include: *.doc;*.zip;*.exe\nExclude: *\\temp\\*
 Gebruiken: *.doc;*.zip;*.exe\nUitsluiten: *\\temp\\*
 Info
 Info
 Information
 Informatie
-Information: If you ignore the error or abort a re-compare will be necessary!
-Informatie: als u de fout negeert of de handeling afbreekt is opnieuw vergelijken noodzakelijk!
 Initialization of Recycle Bin failed!
 Initialiseren van de prullenbak is mislukt.
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
@@ -390,16 +438,20 @@ Left folder:
 Linker map:
 Legend
 Legenda
-Load configuration via...\n     - this list (press DEL to delete items)\n     - drag & drop to this window\n     - startup parameter
-Laad configuratie via...\n     - deze lijst (druk op DEL om items te verwijderen)\n     - drag en drop in dit venster\n     - opstartparameter
-Load from file...
-Laad met behulp van...
+Load configuration from file
+Laad configuratie uit bestand
+Load configuration history (press DEL to delete items)
+Laad configuratiegeschiedenis (druk op DEL om items te verwijderen)
 Log-messages:
 Logberichten:
 Mirror ->>
 Spiegelen ->>
 Mirror backup of left folder: Right folder will be overwritten and exactly match left folder after synchronization.
 Spiegel backup van de linkerkant: de rechterkant wordt overschreven en komt na synchronisatie exact overeen met de linkerkant.
+Move column down
+Verplaats kolom naar beneden
+Move column up
+Verplaats kolom naar boven
 Not all items were synchronized! Have a look at the list.
 Niet alle bestanden zijn gesynchroniseerd! Bekijk de lijst.
 Nothing to synchronize according to configuration!
@@ -410,10 +462,14 @@ Number of files and directories that will be deleted
 Aantal mappen en bestanden die zullen worden verwijderd
 Number of files that will be overwritten
 Aantal bestanden dat zal worden overschreven
+OK
+OKE
 Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the full name including path prefix.
 Alleen de niet gefilterde bestanden worden geselecteerd voor synchronisatie. Het filter wordt toegepast op de volledige naam inclusief pad-voorvoegsel.
 Open synchronization dialog
 Open de synchronisatie-instellingen
+Open with File Manager\tD-Click
+Openen met bestandsbeheerder\tD-klik
 Operation aborted!
 Operatie afgebroken!
 Operation:
@@ -434,6 +490,12 @@ Relative path
 Relatieve pad
 Remove folder pair
 Verwijder 1 paar gekoppelde mappen
+Reset
+Reset
+Reset all warning messages?
+Reset alle waarschuwingen?
+Resets all warning messages
+Reset alle waarschuwingen
 Result
 Resultaat
 Right folder:
@@ -464,10 +526,18 @@ Show files that exist on left side only
 Geef bestanden weer die alleen bestaan aan de linkerkant
 Show files that exist on right side only
 Geef bestanden weer die alleen bestaan aan de rechterkant
+Show popup
+Pop-up weergeven
+Show popup on errors or warnings
+Pop-up weergeven bij foutmeldingen of waarschuwingen
+Significant difference detected: More than 50% of files will be overwritten/deleted!
+Significant verschil gedetecteerd: meer dan 50% van de bestanden zal worden overschreven/verwijderd!
 Silent mode
 Stille modus
 Size
 Grootte
+Sorting file list...
+Bestandslijst sorteren...
 Source code written completely in C++ utilizing:
 Broncode compleet geschreven in C++ met behulp van:
 Start
@@ -484,6 +554,8 @@ Synchronization completed successfully!
 Synchronisatie succesvol afgerond!
 Synchronization completed with errors!
 Synchronisatie afgerond. Er zijn fouten opgetreden.
+Synchronization filter
+Synchronisatie filter
 Synchronization settings
 Synchronisatie instellingen
 Synchronization status
@@ -498,14 +570,18 @@ System out of memory!
 Systeem heeft te weinig geheugen
 The file does not contain a valid configuration:
 Het bestand bevat geen geldige configuratie:
-The selected file does not exist:
-Het volgende geselecteerde bestand bestaat niet:
+The file does not exist:
+Het bestand bestaat niet:
+This commandline will be executed each time you doubleclick on a filename. %name serves as a placeholder for the selected file.
+Deze opdrachtregel wordt bij elke dubbelklik op een bestandsnaam uitgevoerd. %name doet dienst als plaatshouder voor het betreffende bestand.
+This commandline will be executed each time you doubleclick on a filename. %x serves as a placeholder for the selected file.
+Deze opdrachtregel zal elke keer dat u dubbelklikt op een bestandsnaam, worden uitgevoerd. %x doet dienst als opslagplaats voor het geselecteerde bestand.
 This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time. Notice that the file time is allowed to deviate by up to 2 seconds. This ensures synchronization with the lower-precision file system FAT32 works correctly.
 Deze variant ziet twee gelijknamige bestanden als gelijk wanneer ze dezelfde bestandsgrootte EN tijdstempel hebben. Merk op dat tijdstempel 2 seconden mag verschillen. Dit zorgt ervoor dat het minder nauwkeurige FAT-32 ook kan worden gesynchroniseerd.
+Time
+Tijd
 Time elapsed:
 Verstreken tijd:
-Time:
-Tijd:
 Total amount of data that will be transferred
 Hoeveelheid data die verplaatst word
 Total time:
@@ -516,6 +592,8 @@ Unable to create logfile!
 Niet mogelijk om een logbestand aan te maken!
 Unable to initialize Recycle Bin!
 De prullenbak kon niet worden geïnitialiseerd!
+Uncheck all
+Alles uitvinken
 Update ->
 Overschrijven ->
 Update:
diff --git a/Languages/french.lng b/Languages/french.lng
index c4f6207c..600257ca 100644
--- a/Languages/french.lng
+++ b/Languages/french.lng
@@ -28,8 +28,8 @@
 &A propos de...
 &Advanced
 &Avancé
-&Back
-&Quitter
+&Apply
+&Appliquer
 &Cancel
 &Annuler
 &Compare
@@ -50,6 +50,8 @@
 &Ignorer
 &Language
 &Langue
+&Load
+&Charger
 &Load configuration
 &Charger la configuration
 &OK
@@ -58,8 +60,6 @@
 &Pause
 &Quit
 &Quitter
-&Resolve
-&Résoudre
 &Retry
 &Réessayer
 &Save
@@ -114,6 +114,8 @@
 <<	le fichier de gauche est plus récent\n
 <Directory>
 <Répertoire>
+<Last session>
+<Dernière session>
 <multiple selection>
 <sélection multiple>
 <|	file on left side only\n
@@ -144,8 +146,10 @@ As a result the files are separated into the following categories:
 En conclusion, les fichiers sont répartis dans les catégories suivantes:
 As the name suggests, two files which share the same name are marked as equal if and only if they have the same content. This option is useful for consistency checks rather than backup operations. Therefore the file times are not taken into account at all.\n\nWith this option enabled the decision tree is smaller:
 Comme le nom le suggère, deux fichiers qui ont le même nom sont considérés comme identiques si, et seulement si, leur contenu est identique. Cette option est utile pour les contrôles de cohérence plutôt que pour les opérations de sauvegarde. Toutefois, les dates et heures ne sont pas du tout prises en compte.\n\nAvec cette option, l'arbre de décision est plus simple:
-Assemble a batch file with the following settings. To start synchronization in batch mode simply execute this file or schedule it in your operating system's task planner.
-Créer un fichier de commandes avec les paramètres suivants. Pour lancer la synchronisation en mode batch, exécutez ce fichier ou paramétrez-le dans le planificateur de tâches.
+Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.
+Créer un fichier de commandespour une synchronisation automatique. Pour démarrer en mode batch, indiquer le nom du fichier à l'exécutable FreeFileSync: freefilesync.exe <fichier de commandes>. Ceci peut aussi être programmé dans le plannificateur de tâches.
+Batch execution
+Exécution du fichier de commandes
 Batch file created successfully!
 Fichier de commandes créé avec succès!
 Batch job
@@ -156,6 +160,8 @@ Build:
 Créé:
 Cancel
 Annuler
+Check all
+Cocher tout
 Choose to hide filtered files/directories from list
 Masquer les fichiers/répertoires filtrés
 Comma separated list
@@ -192,8 +198,6 @@ Configure your own synchronization rules.
 Paramétrage de vos règles de synchronisation.
 Confirm
 Confirmation
-Consider this when setting up synchronization rules: You might want to avoid write access to these directories so that synchronization of both does not interfere.
-Lisez ceci lors de la mise à jour des règles de synchronisation : Vous voudrez peut-être éviter l'accès en écriture à ces répertoires pour que la synchronisation n'interfère pas.
 Continue
 Continuer
 Conversion error:
@@ -244,14 +248,18 @@ Delete files/folders existing on right side only
 Suppression des fichiers/répertoires n'existant que sur le côté droit
 Delete files\tDEL
 Suppression des fichiers\tDEL
+Delete on both sides
+Suppression des deux côtés
+Delete on both sides even if the file is selected on one side only
+Suppression des deux côtés même si le fichier est sélectionné d'un seul côté
 Delete:
 Suppressions:
 Deleting file %x
 Suppression du fichier %x
 Deleting folder %x
 Suppression du dossier %x
-Directories are dependent:
-Les dossiers sont liés:
+Directories are dependent! Be careful when setting up synchronization rules:
+Les dossiers sont imbriqués! Attention à la mise à jour des règles de synchronisation:
 Directory does not exist:
 Le répertoire n'existe pas:
 Do not show graphical status and error messages but write to a logfile instead
@@ -262,8 +270,8 @@ Do nothing
 Ne rien faire
 Do you really want to delete the following objects(s)?
 Voulez-vous vraiment supprimer les objets suivants ?
-Do you really want to move the following objects(s) to the recycle bin?
-Voulez-vous vraiment envoyer les objets suivants dans la corbeille ?
+Do you really want to move the following objects(s) to the Recycle Bin?
+Voulez-vous vraiment déplacer les objets suivants dans la corbeille?
 Donate with PayPal
 Faites un don avec PayPal
 Drag && drop
@@ -282,16 +290,22 @@ Error deleting directory:
 Erreur lors de la suppression d'un répertoire:
 Error deleting file:
 Erreur lors de la suppression d'un fichier:
-Error moving to recycle bin:
-Erreur lors du déplacement vers la corbeille:
+Error handling
+Erreur de gestion de fichiers
+Error moving to Recycle Bin:
+Erreur lors du déplacement dans la corbeille
 Error parsing configuration file:
 Erreur lors de l'analyse du fichier de configuration:
 Error reading file:
 Erreur lors de la lecture du fichier:
+Error reading folder attributes:
+Erreur lors de la lecture des attributs du dossier
 Error traversing directory:
 Erreur lors du parcours du répertoire:
 Error writing file:
 Erreur lors de l'écriture du fichier:
+Error writing folder attributes:
+Erreur lors de l'écriture des attributs du dossier
 Error: Source directory does not exist anymore:
 Erreur: le répertoire source n'existe plus:
 Example
@@ -302,6 +316,10 @@ Exclude temporarily
 Exclure temporairement
 Exclude via filter:
 Exclure à l'aide du filtre:
+Exit immediately and set returncode < 0
+Sortie immédiate avec le returncode < 0
+Exit with RC < 0
+Sortie avec RC < 0
 FAT32: Handle Daylight Saving Time
 FAT32: Traitement de l'heure d'été
 Feedback and suggestions are welcome at:
@@ -340,14 +358,14 @@ Files/folders that exist on left side only
 Fichiers/répertoires existants seulement à gauche
 Files/folders that exist on right side only
 Fichiers/répertoires existants seulement à droite
-Filter
-Filtrage
 Filter active: Press again to deactivate
 Filtrage actif: Cliquez de nouveau pour le désactiver
 Filter files
 Filtrage des fichiers
 Filter view
 Filtrage de la vue
+Folder Comparison and Synchronization
+Comparaison de Dossiers et Synchronisation
 Folder pair
 Couple de dossiers
 FreeFileSync - Folder Comparison and Synchronization
@@ -360,12 +378,16 @@ FreeFileSync batch file
 FreeFileSync fichier de commandes
 FreeFileSync configuration
 FreeFileSync configuration
+Full name
+Nom complet
 Generating file list...
 Génération de la liste des fichiers...
 Global settings
 Paramètres généraux
 Help
 Aide
+Hide all error and warning messages
+Masquer tous les messages d'erreurs et les avertissements
 Hide files that are different
 Masquer les fichiers différents
 Hide files that are equal
@@ -392,8 +414,8 @@ If you like FFS:
 Si vous aimez FFS:
 Ignore errors
 Ignorer les erreurs
-Ignore next errors
-Ignorer les erreurs suivantes
+Ignore subsequent errors
+Ignorer les erreurs ultérieures
 Ignore this error, retry or abort synchronization?
 Ignorer l'erreur, réessayer ou abandonner la synchronisation ?
 Ignore this error, retry or abort?
@@ -408,8 +430,6 @@ Info
 Info
 Information
 Information
-Information: If you ignore the error or abort a re-compare will be necessary!
-Information: Si vous ignorez l'erreur ou abandonnez, il sera nécessaire de relancer la comparaison!
 Initialization of Recycle Bin failed!
 Erreur lors de l'initialisation de la corbeille !
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
@@ -418,10 +438,10 @@ Left folder:
 Répertoire de gauche:
 Legend
 Legende
-Load configuration via...\n     - this list (press DEL to delete items)\n     - drag & drop to this window\n     - startup parameter
-Charger la configuration via...\n     - cette liste (Appuyez sur Suppr pour supprimer des éléments),\n     - un glisser-déposer vers cette fenêtre,\n     - les paramètres de démarrage.
-Load from file...
-Chargement à partir du fichier...
+Load configuration from file
+Charger la configuration à partir du fichier
+Load configuration history (press DEL to delete items)
+Charger l'historique des configuration (appuyez sur Suppr pour supprimer des éléments)
 Log-messages:
 Messages log:
 Mirror ->>
@@ -470,6 +490,12 @@ Relative path
 Chemin
 Remove folder pair
 Supprimer le couple de dossiers
+Reset
+Réinitialiser
+Reset all warning messages?
+Réinitialiser tous les avertissements?
+Resets all warning messages
+Réinitialise tous les avertissements
 Result
 Situation
 Right folder:
@@ -500,6 +526,12 @@ Show files that exist on left side only
 Afficher les fichiers existants seulement à gauche
 Show files that exist on right side only
 Afficher les fichiers existants seulement à droite
+Show popup
+Affich
+Show popup on errors or warnings
+Affiche une boîte de dialogue pour chaque erreur ou avertissement
+Significant difference detected: More than 50% of files will be overwritten/deleted!
+Différence significative détectée: Plus de 50% des fichiers seront écrasés ou détruits!
 Silent mode
 Mode silencieux
 Size
@@ -538,16 +570,18 @@ System out of memory!
 Erreur mémoire système!
 The file does not contain a valid configuration:
 Le fichier ne contient pas de configuration valide
-The selected file does not exist:
-Le fichier sélectionné n'existe pas:
+The file does not exist:
+Le fichier n'existe pas:
+This commandline will be executed each time you doubleclick on a filename. %name serves as a placeholder for the selected file.
+Cette ligne de commandes sera exécutée chaque fois que vous double-cliquerez sur un fichier. %name sert d'emplacement pour le fichier sélectionné.
 This commandline will be executed each time you doubleclick on a filename. %x serves as a placeholder for the selected file.
 Cette commande sera exécutée à chaque fois que vous double-cliquez sur un nom de fichier. %x est un espace réservé pour le fichier sélectionné.
 This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time. Notice that the file time is allowed to deviate by up to 2 seconds. This ensures synchronization with the lower-precision file system FAT32 works correctly.
 Cette variante définit comme identiques deux fichiers de même nom lorsqu'ils ont la même taille et le même date et heure de modification. Attention : la précision de l'heure est mesurée à 2 secondes près. Cela permet d'assurer la synchronisation avec la précision du systéme de fichiers FAT32.
+Time
+Heure
 Time elapsed:
 Temps écoulé:
-Time:
-Heure:
 Total amount of data that will be transferred
 Volume de données à transférer
 Total time:
@@ -558,6 +592,8 @@ Unable to create logfile!
 Impossible de créer un fichier log!
 Unable to initialize Recycle Bin!
 Impossible d'initialiser la corbeille!
+Uncheck all
+Décocher tout
 Update ->
 Mise à Jour ->
 Update:
diff --git a/Languages/german.lng b/Languages/german.lng
index 9df728a1..ab1b336c 100644
--- a/Languages/german.lng
+++ b/Languages/german.lng
@@ -28,8 +28,8 @@
 &Über...
 &Advanced
 &Erweitert
-&Back
-&Zurück
+&Apply
+&Übernehmen
 &Cancel
 &Abbrechen
 &Compare
@@ -50,6 +50,8 @@ Dateiliste e&xportieren
 &Ignorieren
 &Language
 &Sprache
+&Load
+&Laden
 &Load configuration
 Konfiguration &laden
 &OK
@@ -58,8 +60,6 @@ Konfiguration &laden
 &Pause
 &Quit
 &Beenden
-&Resolve
-&Beheben
 &Retry
 &Wiederholen
 &Save
@@ -114,6 +114,8 @@ Konfiguration &laden
 <<	Linke Datei ist neuer\n
 <Directory>
 <Verzeichnis>
+<Last session>
+<Letzte Sitzung>
 <multiple selection>
 <Mehrfachauswahl>
 <|	file on left side only\n
@@ -144,8 +146,10 @@ As a result the files are separated into the following categories:
 Das Ergebnis ist eine Aufteilung in folgende Kategorien:
 As the name suggests, two files which share the same name are marked as equal if and only if they have the same content. This option is useful for consistency checks rather than backup operations. Therefore the file times are not taken into account at all.\n\nWith this option enabled the decision tree is smaller:
 Wie der Name andeutet, werden zwei Dateien mit gleichem Namen genau dann als gleich angesehen, wenn sie den gleichen Dateiinhalt haben. Diese Einstellung ist eher für Konsistenzprüfungen geeignet als für Backup-Operationen. Aus diesem Grund wird der Zeitpunkt der letzten Änderung der Dateien nicht berücksichtigt.\n\nDer Entscheidungsbaum ist in diesem Fall kleiner:
-Assemble a batch file with the following settings. To start synchronization in batch mode simply execute this file or schedule it in your operating system's task planner.
-Erzeuge eine Batchdatei mit den folgenden Parametern. Um im Batch-Modus zu synchronisieren, kann diese einfach gestartet oder in den Task-Planer des Betriebssystems eingetragen werden.
+Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.
+Erzeuge eine Batchdatei für die automatisierte Synchronisation. Um den Batch-Modus zu starten, muss nur der Dateiname an die Programmdatei übergeben werden: FreeFileSync.exe <Batchdatei>. Dies kann auch in den Taskplaner des Betriebssystems eingetragen werden.
+Batch execution
+Batchlauf
 Batch file created successfully!
 Batchdatei wurde erfolgreich erstellt!
 Batch job
@@ -156,6 +160,8 @@ Build:
 Build:
 Cancel
 Abbrechen
+Check all
+Alles auswählen
 Choose to hide filtered files/directories from list
 Gefilterte Dateien bzw. Verzeichnisse ein-/ausblenden
 Comma separated list
@@ -192,8 +198,6 @@ Configure your own synchronization rules.
 Eigene Synchronisationsregeln definieren.
 Confirm
 Bestätigen
-Consider this when setting up synchronization rules: You might want to avoid write access to these directories so that synchronization of both does not interfere.
-Achtung beim Festlegen der Synchronisationseinstellungen: Ein Schreibzugriff auf diese Verzeichnisse sollte vermieden werden, so dass sich die Synchronization von beiden nicht gegenseitig beeinflusst.
 Continue
 Fortfahren
 Conversion error:
@@ -244,14 +248,18 @@ Delete files/folders existing on right side only
 Nur rechts existierende Dateien/Verzeichnisse löschen
 Delete files\tDEL
 Dateien löschen\tDEL
+Delete on both sides
+Auf beiden Seiten löschen
+Delete on both sides even if the file is selected on one side only
+Lösche auf beiden Seiten, auch wenn die Datei nur auf einer Seite markiert ist
 Delete:
 Löschen:
 Deleting file %x
 Lösche Datei %x
 Deleting folder %x
 Lösche Verzeichnis %x
-Directories are dependent:
-Die Verzeichnisse sind voneinander abhängig:
+Directories are dependent! Be careful when setting up synchronization rules:
+Die Verzeichnisse sind voneinander abhängig! Achtung beim Festlegen der Synchronisationseinstellungen:
 Directory does not exist:
 Das Verzeichnis existiert nicht:
 Do not show graphical status and error messages but write to a logfile instead
@@ -262,7 +270,7 @@ Do nothing
 Nichts tun
 Do you really want to delete the following objects(s)?
 Sollen folgende Elemente wirklich gelöscht werden?
-Do you really want to move the following objects(s) to the recycle bin?
+Do you really want to move the following objects(s) to the Recycle Bin?
 Sollen folgende Elemente wirklich in den Papierkorb verschoben werden?
 Donate with PayPal
 Mit PayPal spenden
@@ -282,7 +290,9 @@ Error deleting directory:
 Fehler beim Löschen des Verzeichnisses:
 Error deleting file:
 Fehler beim Löschen der Datei:
-Error moving to recycle bin:
+Error handling
+Fehlerbehandlung
+Error moving to Recycle Bin:
 Fehler beim Verschieben in den Papierkorb:
 Error parsing configuration file:
 Fehler beim Lesen der Konfigurationsdatei:
@@ -306,6 +316,10 @@ Exclude temporarily
 Temporär ausschließen
 Exclude via filter:
 Über Filter ausschließen:
+Exit immediately and set returncode < 0
+Sofort beenden und Returncode < 0 setzen
+Exit with RC < 0
+Beenden mit RC < 0
 FAT32: Handle Daylight Saving Time
 FAT32: Sommer-/Winterzeitumstellung berücksichtigen
 Feedback and suggestions are welcome at:
@@ -344,14 +358,14 @@ Files/folders that exist on left side only
 Nur links exisitierende Dateien/Verzeichnisse
 Files/folders that exist on right side only
 Nur rechts exisitierende Dateien/Verzeichnisse
-Filter
-Filter
 Filter active: Press again to deactivate
 Filter aktiviert: Zum Deaktivieren erneut anwählen
 Filter files
 Dateien filtern
 Filter view
 Ansicht filtern
+Folder Comparison and Synchronization
+Verzeichnisvergleich und Synchronisation
 Folder pair
 Verzeichnispaar
 FreeFileSync - Folder Comparison and Synchronization
@@ -364,12 +378,16 @@ FreeFileSync batch file
 FreeFileSync Batchdatei
 FreeFileSync configuration
 FreeFileSync Konfiguration
+Full name
+Absoluter Name
 Generating file list...
 Erzeuge Dateiliste...
 Global settings
 Globale Einstellungen
 Help
 Hilfe
+Hide all error and warning messages
+Alle Fehler- und Warnmeldungen werden unterdrückt
 Hide files that are different
 Ungleiche Dateien ausblenden
 Hide files that are equal
@@ -387,7 +405,7 @@ Gefilterte Elemente ausblenden
 Hide further error messages during the current process
 Weitere Fehlermeldungen während des laufenden Prozesses ausblenden
 Hides error messages during synchronization:\nThey are collected and shown as a list at the end of the process
-Verhindert das Anzeigen von Fehlermeldungen während der Synchronisation:\nSie werden jedoch gesammelt und nach Vorgangsende als Liste angezeigt
+Verhindert das Anzeigen von Fehlermeldungen während der Synchronisation:\nSie werden jedoch gesammelt und am Ende als Liste angezeigt
 Hints:
 Tipps:
 Homepage:
@@ -396,8 +414,8 @@ If you like FFS:
 FFS unterstützen:
 Ignore errors
 Fehler ignorieren
-Ignore next errors
-Weitere Fehler ignorieren
+Ignore subsequent errors
+Nachfolgende Fehler ignorieren
 Ignore this error, retry or abort synchronization?
 Fehler ignorieren, wiederholen oder Synchronisation abbrechen?
 Ignore this error, retry or abort?
@@ -412,8 +430,6 @@ Info
 Info
 Information
 Information
-Information: If you ignore the error or abort a re-compare will be necessary!
-Information: Wenn der Fehler ignoriert oder der Vorgang abgebrochen wird, ist ein neuer Vergleich erforderlich!
 Initialization of Recycle Bin failed!
 Die Initialisierung des Papierkorbs ist fehlgeschlagen!
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
@@ -422,12 +438,12 @@ Left folder:
 Linkes Verzeichnis:
 Legend
 Legende
-Load configuration via...\n     - this list (press DEL to delete items)\n     - drag & drop to this window\n     - startup parameter
-Konfiguration laden über...\n     - diese Liste (DEL-Taste löscht Einträge)\n     - Drag & Drop auf dieses Fenster\n     - Startupparameter
-Load from file...
-Von Datei laden...
+Load configuration from file
+Konfiguration aus Datei laden
+Load configuration history (press DEL to delete items)
+Lade Konfigurationshistorie (DEL-Taste löscht Einträge)
 Log-messages:
-Protokollmitteilungen:
+Protokollmeldungen:
 Mirror ->>
 Spiegeln ->>
 Mirror backup of left folder: Right folder will be overwritten and exactly match left folder after synchronization.
@@ -451,7 +467,7 @@ OK
 Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the full name including path prefix.
 Für die Synchronisation werden nur die Dateien/Verzeichnisse berücksichtigt, die den Filtereinstellungen entsprechen. Der Filter wird dabei auf den kompletten Dateinamen einschließlich Pfadprefix angewandt.
 Open synchronization dialog
-Zeige Synchronisationseinstellungen
+Synchronisationseinstellungen zeigen
 Open with File Manager\tD-Click
 Mit Dateimanager öffnen\tD-Click
 Operation aborted!
@@ -474,6 +490,12 @@ Relative path
 Relativer Pfad
 Remove folder pair
 Verzeichnispaar entfernen
+Reset
+Zurücksetzen
+Reset all warning messages?
+Sollen alle Warnmeldungen zurückgesetzt werden?
+Resets all warning messages
+Setzt alle Warnmeldungen zurück
 Result
 Ergebnis
 Right folder:
@@ -504,6 +526,12 @@ Show files that exist on left side only
 Nur links existierende Dateien anzeigen
 Show files that exist on right side only
 Nur rechts existierende Dateien anzeigen
+Show popup
+Popup zeigen
+Show popup on errors or warnings
+Zeigt ein Auswahlfenster bei Fehlern oder Warnungen an
+Significant difference detected: More than 50% of files will be overwritten/deleted!
+Ein erheblicher Unterschied wurde festgestellt: Mehr als 50% der Dateien werden überschrieben/gelöscht!
 Silent mode
 Stiller Modus
 Size
@@ -542,16 +570,18 @@ System out of memory!
 Zu wenig freier Arbeitsspeicher!
 The file does not contain a valid configuration:
 Die Datei enthält keine gültige Konfiguration:
-The selected file does not exist:
-Die ausgewählte Datei existiert nicht:
+The file does not exist:
+Die Datei existiert nicht:
+This commandline will be executed each time you doubleclick on a filename. %name serves as a placeholder for the selected file.
+Diese Kommandozeile wird bei jedem Doppelklick auf einen Dateinamen ausgeführt. %name dient dabei als Platzhalter für die ausgewählte Datei.
 This commandline will be executed each time you doubleclick on a filename. %x serves as a placeholder for the selected file.
 Diese Befehlszeile wird ausgeführt, wenn ein Doppelklick auf einen Dateinamen erfolgt. %x ist hierbei der Platzhalter für die ausgewählte Datei.
 This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time. Notice that the file time is allowed to deviate by up to 2 seconds. This ensures synchronization with the lower-precision file system FAT32 works correctly.
 Diese Variante identifiziert zwei gleichnamige Dateien als gleich, wenn sie die gleiche Dateigröße haben UND der Zeitpunkt der letzten Änderung derselbe ist. Dabei wird eine Abweichung von bis zu zwei Sekunden toleriert. So ist sichergestellt, dass eine Synchronisation gegen ein FAT32 Dateisystem korrekt funktioniert.
+Time
+Uhrzeit
 Time elapsed:
 Vergangene Zeit:
-Time:
-Zeit:
 Total amount of data that will be transferred
 Gesamtmenge der zu übertragenden Daten
 Total time:
@@ -562,6 +592,8 @@ Unable to create logfile!
 Die Protokolldatei konnte nicht erstellt werden!
 Unable to initialize Recycle Bin!
 Der Papierkorb konnte nicht initialisiert werden!
+Uncheck all
+Nichts auswählen
 Update ->
 Aktualisieren ->
 Update:
diff --git a/Languages/italian.lng b/Languages/italian.lng
index 54a84bf9..7d685ee9 100644
--- a/Languages/italian.lng
+++ b/Languages/italian.lng
@@ -25,11 +25,11 @@
 &Abort
 &Abbandona
 &About...
-&A proposito di...
+&Informazioni...
 &Advanced
 &Avanzate
-&Back
-&Indietro
+&Apply
+&Applica
 &Cancel
 &Annulla
 &Compare
@@ -50,6 +50,8 @@
 &Ignora
 &Language
 &Lingua
+&Load
+&Carica
 &Load configuration
 &Carica la configurazione
 &OK
@@ -58,8 +60,6 @@
 &Pausa
 &Quit
 &Esci
-&Resolve
-&Risolvi
 &Retry
 &Riprova
 &Save
@@ -114,6 +114,8 @@
 <<	il file di sinistra è più recente\n
 <Directory>
 <Directory>
+<Last session>
+<Ultima sessione>
 <multiple selection>
 <selezione multipla>
 <|	file on left side only\n
@@ -144,8 +146,10 @@ As a result the files are separated into the following categories:
 I file risultano infine ripartiti nelle seguenti categorie:
 As the name suggests, two files which share the same name are marked as equal if and only if they have the same content. This option is useful for consistency checks rather than backup operations. Therefore the file times are not taken into account at all.\n\nWith this option enabled the decision tree is smaller:
 Come suggerisce il nome, due file con lo stesso nome sono considerati come identici se, e solamente se, il loro contenuto è identico. Questa opzione è utile sia per i contrlli di coerenza che per le operazioni di backup. Tuttavia, data e ora vengono ignorate.\n\nAbilitando questa opzione l'albero delle decisioni è semplificato:
-Assemble a batch file with the following settings. To start synchronization in batch mode simply execute this file or schedule it in your operating system's task planner.
-Creare un file batch con i seguenti parametri. Per lanciare la sincronizzazione in modalità batch, eseguire questo file o schedularlo nelle operazioni pianificate del sistema operativo.
+Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.
+Componi un file batch per la sincronia automatica. Per partire in modalità batch fai semplicemente seguire il nome del file all'eseguibile di FreeFileSync: FreeFileSync.exe <nomefilebatch>. Puoi anche schedulare l'operazione nelle operazioni pianificate del sistema operativo.
+Batch execution
+Esecuzione in batch
 Batch file created successfully!
 Creazione batch file riuscita!
 Batch job
@@ -156,6 +160,8 @@ Build:
 Build:
 Cancel
 Annulla
+Check all
+Seleziona tutto
 Choose to hide filtered files/directories from list
 Nascondi i files/directories dalla lista
 Comma separated list
@@ -192,8 +198,6 @@ Configure your own synchronization rules.
 Configura le tue regole di sincronizzazione.
 Confirm
 Conferma
-Consider this when setting up synchronization rules: You might want to avoid write access to these directories so that synchronization of both does not interfere.
-Da considerare per il settaggio delle regole di sincronizzazione: Per non interferire con la sincronizzazione potrebbe essere utile bloccare l'accesso in scrittura a queste directory.
 Continue
 Continua
 Conversion error:
@@ -244,14 +248,18 @@ Delete files/folders existing on right side only
 Elimina files/cartelle esistenti solo a destra
 Delete files\tDEL
 Elimina file\tDEL
+Delete on both sides
+Cancella su entrambi i lati
+Delete on both sides even if the file is selected on one side only
+Cancella su entrambi i lati anche se il file è selezionato su un solo lato.
 Delete:
 Elimina: 
 Deleting file %x
 Eliminazione file %x
 Deleting folder %x
 Eliminazione cartella %x
-Directories are dependent:
-Le directory sono dipendenti:
+Directories are dependent! Be careful when setting up synchronization rules:
+Le directory sono dipendenti! Fai attenzione quando configuri le regole di sincronizzazione:
 Directory does not exist:
 La directory non esiste:
 Do not show graphical status and error messages but write to a logfile instead
@@ -262,8 +270,8 @@ Do nothing
 Non fare nulla
 Do you really want to delete the following objects(s)?
 Vuoi veramente eliminare i seguenti oggetti?
-Do you really want to move the following objects(s) to the recycle bin?
-Vuoi veramente eliminare i seguenti oggetti dal cestino?
+Do you really want to move the following objects(s) to the Recycle Bin?
+Vuoi veramente spostare i seguenti oggetti nel Cestino?
 Donate with PayPal
 Fai una donazione con PayPal
 Drag && drop
@@ -282,8 +290,10 @@ Error deleting directory:
 Errore durante l'eliminazione delle directory:
 Error deleting file:
 Errore durante l'eliminazione del file:
-Error moving to recycle bin:
-Errore durante lo spostamento nel cestino:
+Error handling
+Errore nella gestione
+Error moving to Recycle Bin:
+Errore durante lo spostamento nel Cestino:
 Error parsing configuration file:
 Errore durante l'analisi del file di configurazione:
 Error reading file:
@@ -306,6 +316,10 @@ Exclude temporarily
 Escludi temporaneamente
 Exclude via filter:
 Escludi tramite filtro:
+Exit immediately and set returncode < 0
+Esci immediatamente ed imposta returncode < 0
+Exit with RC < 0
+Esci con RC < 0
 FAT32: Handle Daylight Saving Time
 FAT32: Gestisci Ora di Modifica
 Feedback and suggestions are welcome at:
@@ -344,14 +358,14 @@ Files/folders that exist on left side only
 Files/cartelle esistenti solo a sinistra
 Files/folders that exist on right side only
 Files/cartelle esistenti solo a destra
-Filter
-Filtro
 Filter active: Press again to deactivate
 Filtro attivo: Clicca nuovamente per disattivare
 Filter files
 Filtro dei files
 Filter view
 Filtro della vista
+Folder Comparison and Synchronization
+Comparazione di Cartelle e Sincronizzazione
 Folder pair
 Coppia di cartelle
 FreeFileSync - Folder Comparison and Synchronization
@@ -364,12 +378,16 @@ FreeFileSync batch file
 FreeFileSync batch file
 FreeFileSync configuration
 FreeFileSync configurazione
+Full name
+Nome completo
 Generating file list...
 Generazione lista dei file...
 Global settings
 Preferenze
 Help
 Aiuto
+Hide all error and warning messages
+Nascondi tutti gli errori e i messaggi d'avviso
 Hide files that are different
 Nascondi i file differenti
 Hide files that are equal
@@ -396,7 +414,7 @@ If you like FFS:
 Se ti piace FFS:
 Ignore errors
 Ignora gli errori
-Ignore next errors
+Ignore subsequent errors
 Ignora gli errori successivi
 Ignore this error, retry or abort synchronization?
 Ignora questo errore, riprova o abbandona la sincronizzazione?
@@ -412,8 +430,6 @@ Info
 Info
 Information
 Informazioni
-Information: If you ignore the error or abort a re-compare will be necessary!
-Informazioni: Ignorando l'errore o abbandonando, sarà necessario far ripartire la comparazione!
 Initialization of Recycle Bin failed!
 Inizializzazione del Cestino fallita!
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
@@ -422,10 +438,10 @@ Left folder:
 Cartella di sinistra:
 Legend
 Legenda
-Load configuration via...\n     - this list (press DEL to delete items)\n     - drag & drop to this window\n     - startup parameter
-Carica la configurazione da...\n     - questa lista (premi DEL per eliminare elementi),\n     - trascina e rilascia in questa finestra,\n     - i parametri di partenza.
-Load from file...
-Carica da file...
+Load configuration from file
+Carica configurazione da file
+Load configuration history (press DEL to delete items)
+Carica la cronologia delle configurazioni (premi DEL per eliminare elementi)
 Log-messages:
 Log-messages:
 Mirror ->>
@@ -474,6 +490,12 @@ Relative path
 Percorso relativo
 Remove folder pair
 Elimina la coppia di cartelle
+Reset
+Reset
+Reset all warning messages?
+Resettare tutti gli avvisi?
+Resets all warning messages
+Resetta tutti gli avvisi
 Result
 Risultato
 Right folder:
@@ -504,6 +526,12 @@ Show files that exist on left side only
 Mostra file esistenti solo a sinistra
 Show files that exist on right side only
 Mostra file esistenti solo a destra
+Show popup
+Mostra popup
+Show popup on errors or warnings
+Mostra popup degli errori o avvisi
+Significant difference detected: More than 50% of files will be overwritten/deleted!
+Riscontrate differenze significative: Più del 50% dei file saranno sovrascritti/cancellati!
 Silent mode
 Modalità Silenziosa
 Size
@@ -542,16 +570,18 @@ System out of memory!
 Memoria di sistema esaurita!
 The file does not contain a valid configuration:
 Il file non contiene una configurazione valida
-The selected file does not exist:
-Il file selezionato non esiste:
+The file does not exist:
+Il file non esiste:
+This commandline will be executed each time you doubleclick on a filename. %name serves as a placeholder for the selected file.
+Questa riga di comando verrà eseguita ad ogni doppio click sul nome di un file. %name é lo spazio riservato per il file selezionato.
 This commandline will be executed each time you doubleclick on a filename. %x serves as a placeholder for the selected file.
-Questa commandline verrà eseguita ad ogni doppio click sul nome di un file. %x é lo spazio riservato per il file selezionato.
+Questa riga di comando verrà eseguita ad ogni doppio click sul nome di un file. %x é lo spazio riservato per il file selezionato.
 This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time. Notice that the file time is allowed to deviate by up to 2 seconds. This ensures synchronization with the lower-precision file system FAT32 works correctly.
 Questa variante definisce identici due file con lo stesso nome quando hanno la stessa dimensione E la stessa data e ora. Attenzione: la precisione dell'ora è di circa 2 secondi. Ciò assicura il corretto funzionamneto della sincronizzazione con la precisione del file system FAT32.
+Time
+Ora
 Time elapsed:
 Tempo trascorso:
-Time:
-Ora:
 Total amount of data that will be transferred
 Volume dei dati che verranno trasferiti
 Total time:
@@ -562,6 +592,8 @@ Unable to create logfile!
 Impossibile creaer il file di log!
 Unable to initialize Recycle Bin!
 Impossibile inizializzare il Cestino!
+Uncheck all
+Deseleziona tutto
 Update ->
 Aggiorna ->
 Update:
diff --git a/Languages/japanese.lng b/Languages/japanese.lng
index ede371f5..4e2bcb88 100644
--- a/Languages/japanese.lng
+++ b/Languages/japanese.lng
@@ -28,8 +28,8 @@
 情報(&A)...
 &Advanced
 拡張(&A)
-&Back
-戻る(&B)
+&Apply
+適用(&A)
 &Cancel
 キャンセル(&C)
 &Compare
@@ -50,6 +50,8 @@
 無視(&I)
 &Language
 使用言語(&L)
+&Load
+読み込み(&L)
 &Load configuration
 構成設定の読み込み(&L)
 &OK
@@ -58,8 +60,6 @@
 一時停止(&P)
 &Quit
 終了(&Q)
-&Resolve
-決定(&R)
 &Retry
 再試行(&R)
 &Save
@@ -114,6 +114,8 @@
 <<	左側の方が新しい\n
 <Directory>
 <ディレクトリ>
+<Last session>
+<最後のセッション>
 <multiple selection>
 <複数選択>
 <|	file on left side only\n
@@ -144,8 +146,10 @@ As a result the files are separated into the following categories:
 ファイルは以下のカテゴリに分類されます:
 As the name suggests, two files which share the same name are marked as equal if and only if they have the same content. This option is useful for consistency checks rather than backup operations. Therefore the file times are not taken into account at all.\n\nWith this option enabled the decision tree is smaller:
 このオプションでは、同じ名前を共有するファイルで内容が同じ場合は、同一として扱われます。 バックアップ操作より、むしろ整合性のチェックを行う時に役立つオプションです。 従ってファイルの日時については全く考慮されていません。\n\n設定が有効な時は、ツリー表示が小さくなります。
-Assemble a batch file with the following settings. To start synchronization in batch mode simply execute this file or schedule it in your operating system's task planner.
-以下の設定で一括処理(バッチ)ファイルを作成します。使用方法は、そのままファイルを実行するか、OS のタスクスケジューラを利用して実行することもできます。
+Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.
+一括で同期処理を行うためのバッチファイルを作成します。一括モードを開始するときは、ファイルのパス名を実行ファイル\n< FreeFileSync.exe> \nにバッチファイルで渡すだけです。また、この操作はOSのタスクスケジューラから実行することができます。
+Batch execution
+一括処理を実行
 Batch file created successfully!
 バッチファイルが作成されました!
 Batch job
@@ -156,6 +160,8 @@ Build:
 ビルド:
 Cancel
 中止
+Check all
+すべて選択
 Choose to hide filtered files/directories from list
 リストから除外したいファイル/ディレクトリを選択
 Comma separated list
@@ -192,8 +198,6 @@ Configure your own synchronization rules.
 あなたの設定した同期規則
 Confirm
 確認
-Consider this when setting up synchronization rules: You might want to avoid write access to these directories so that synchronization of both does not interfere.
-同期規則を設定する時の備考: ディレクトリの書き込みアクセスを回避することで、これら両方の同期処理が干渉しないようにすることが考えられます。
 Continue
 続行
 Conversion error:
@@ -244,14 +248,18 @@ Delete files/folders existing on right side only
 右側のみに存在するファイル/フォルダを削除
 Delete files\tDEL
 ファイルを削除\tDEL
+Delete on both sides
+両方を削除
+Delete on both sides even if the file is selected on one side only
+片側のペインのみ選択されている場合でも両方を削除する
 Delete:
 削除:
 Deleting file %x
 ファイル %x を削除中
 Deleting folder %x
 フォルダ %x を削除中
-Directories are dependent:
-ディレクトリの依存関係:
+Directories are dependent! Be careful when setting up synchronization rules:
+ディレクトリが依存関係にあります! 同期規則の設定時には注意してください:
 Directory does not exist:
 ディレクトリが存在しません:
 Do not show graphical status and error messages but write to a logfile instead
@@ -262,8 +270,8 @@ Do nothing
 何もしない
 Do you really want to delete the following objects(s)?
 本当に以下のオブジェクトを削除しますか?
-Do you really want to move the following objects(s) to the recycle bin?
-本当に以下のオブジェクトをゴミ箱に移動しますか?
+Do you really want to move the following objects(s) to the Recycle Bin?
+本当に以下のオブジェクト(複)をゴミ箱に移動しますか?
 Donate with PayPal
 PayPal から寄付する
 Drag && drop
@@ -282,16 +290,22 @@ Error deleting directory:
 ディレクトリの削除エラー:
 Error deleting file:
 ファイルの削除エラー:
-Error moving to recycle bin:
-ゴミ箱への移動に失敗しました:
+Error handling
+ハンドリングのエラー
+Error moving to Recycle Bin:
+ゴミ箱への移動に失敗:
 Error parsing configuration file:
 構成ファイルの構文に誤りがあります:
 Error reading file:
 ファイル読み込みエラー:
+Error reading folder attributes:
+フォルダ属性の読み取りエラー:
 Error traversing directory:
 ディレクトリの移動エラー:
 Error writing file:
 ファイル書き込みエラー:
+Error writing folder attributes:
+フォルダ属性の書き込みエラー:
 Error: Source directory does not exist anymore:
 エラー: ソースディレクトリが存在しません:
 Example
@@ -302,6 +316,10 @@ Exclude temporarily
 一時フォルダを除外
 Exclude via filter:
 フィルターを通して除外
+Exit immediately and set returncode < 0
+すぐに終了する場合の戻り値設定 < 0
+Exit with RC < 0
+RC で終了 < 0
 FAT32: Handle Daylight Saving Time
 FAT32: 夏時間の取り扱いを有効
 Feedback and suggestions are welcome at:
@@ -340,14 +358,14 @@ Files/folders that exist on left side only
 左側のみに存在するファイル/フォルダ
 Files/folders that exist on right side only
 右側のみに存在するファイル/フォルダ
-Filter
-フィルタ
 Filter active: Press again to deactivate
 フィルター有効化: 再度押すと無効化
 Filter files
 ファイルフィルター
 Filter view
 表示フィルター
+Folder Comparison and Synchronization
+フォルダの比較と同期
 Folder pair
 フォルダペア
 FreeFileSync - Folder Comparison and Synchronization
@@ -360,12 +378,16 @@ FreeFileSync batch file
 FreeFileSync バッチファイル
 FreeFileSync configuration
 FreeFileSync 構成設定
+Full name
+完全な名前
 Generating file list...
 ファイル一覧を作成中...
 Global settings
 全般的な設定
 Help
 ヘルプ
+Hide all error and warning messages
+すべてのエラーと警告メッセージを非表示
 Hide files that are different
 異なるファイルを非表示
 Hide files that are equal
@@ -392,8 +414,8 @@ If you like FFS:
 FFS が気に入った場合:
 Ignore errors
 エラーを無視
-Ignore next errors
-次のエラーを無視
+Ignore subsequent errors
+以降のエラーを無視
 Ignore this error, retry or abort synchronization?
 このエラーを無視して再試行、或いは同期を中止しますか?
 Ignore this error, retry or abort?
@@ -408,8 +430,6 @@ Info
 情報
 Information
 インフォメーション
-Information: If you ignore the error or abort a re-compare will be necessary!
-インフォメーション: このエラーを無視して中断した場合は、再比較が必要です!
 Initialization of Recycle Bin failed!
 ゴミ箱の初期化に失敗しました!
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
@@ -418,10 +438,10 @@ Left folder:
 左側フォルダ:
 Legend
 履歴
-Load configuration via...\n     - this list (press DEL to delete items)\n     - drag & drop to this window\n     - startup parameter
-構成ファイルの読み込み...\n    - リスト (DEL-でアイテムを削除)\n    - ウィンドウにドラッグ & ドロップ\n    - 起動時のパラメータ
-Load from file...
-ファイルから読み込み...
+Load configuration from file
+外部ファイルから構成設定を読み込みます
+Load configuration history (press DEL to delete items)
+構成設定履歴の読み込み(DELキーでアイテムを削除)
 Log-messages:
 ログメッセージ:
 Mirror ->>
@@ -470,6 +490,12 @@ Relative path
 相対パス
 Remove folder pair
 フォルダペアを除去
+Reset
+リセット
+Reset all warning messages?
+すべての警告をリセットしますか?
+Resets all warning messages
+すべての警告をリセット
 Result
 結果
 Right folder:
@@ -500,6 +526,12 @@ Show files that exist on left side only
 左側のみに存在するファイルを表示
 Show files that exist on right side only
 右側のみに存在するファイルを表示
+Show popup
+ポップアップ表示
+Show popup on errors or warnings
+エラー/警告をポップアップ表示
+Significant difference detected: More than 50% of files will be overwritten/deleted!
+大幅な差異の検出: 50%以上のファイルが上書き、または削除されています!
 Silent mode
 サイレントモード
 Size
@@ -538,16 +570,18 @@ System out of memory!
 メモリが不足しています!
 The file does not contain a valid configuration:
 このファイルには有効な構成が含まれていません:
-The selected file does not exist:
-選択されたファイルは存在しません:
+The file does not exist:
+ファイルが存在しません:
+This commandline will be executed each time you doubleclick on a filename. %name serves as a placeholder for the selected file.
+ファイル名をダブルクリックする度に、このコマンドが実行されます。%name は選択ファイルのプレースフォルダとして機能します。
 This commandline will be executed each time you doubleclick on a filename. %x serves as a placeholder for the selected file.
 ファイル名をダブルクリックする度に、このコマンドが実行されます。%x は選択ファイルのプレースフォルダとして機能します。
 This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time. Notice that the file time is allowed to deviate by up to 2 seconds. This ensures synchronization with the lower-precision file system FAT32 works correctly.
 この変数では、ふたつの同名ファイルが存在した場合、 それぞれのファイルサイズと最終更新日付/時間を比較します。\nファイル時間の差異が 2 秒以内の場合は検出されないということに注意してください。 (これは、FAT32システムで正確に同期を行うことができる最小値です)
+Time
+時間
 Time elapsed:
 経過時間:
-Time:
-時間:
 Total amount of data that will be transferred
 転送されたデータの総量
 Total time:
@@ -558,6 +592,8 @@ Unable to create logfile!
 ログファイルを作成出来ません!
 Unable to initialize Recycle Bin!
 ゴミ箱の初期化が出来ません!
+Uncheck all
+すべて解除
 Update ->
 更新 ->
 Update:
diff --git a/Languages/polish.lng b/Languages/polish.lng
index 803b7a48..93b1ef1f 100644
--- a/Languages/polish.lng
+++ b/Languages/polish.lng
@@ -1,4 +1,4 @@
-  MinGW \t- Windows port of GNU Compiler Collection\n  wxWidgets \t- Open-Source GUI framework\n  wxFormBuilder\t- wxWidgets GUI-builder\n  CodeBlocks \t- Open-Source IDE
+  MinGW \t- Windows port of GNU Compiler Collection\n  wxWidgets \t- Open-Source GUI framework\n  wxFormBuilder\t- wxWidgets GUI-builder\n  CodeBlocks \t- Open-Source IDE
   MinGW \t- Windows port of GNU Compiler Collection\n  wxWidgets \t- Open-Source GUI framework\n  wxFormBuilder\t- wxWidgets GUI-builder\n  CodeBlocks \t- Open-Source IDE
  Byte
  Bajt
@@ -28,8 +28,8 @@
 &O Programie...
 &Advanced
 &Zaawansowane
-&Back
-&Cofnij
+&Apply
+&Zastosuj
 &Cancel
 &Anuluj
 &Compare
@@ -50,6 +50,8 @@
 &Ignoruj
 &Language
 &Język
+&Load
+&Wczytaj
 &Load configuration
 &Ładuj konfigurację
 &OK
@@ -57,9 +59,7 @@
 &Pause
 &Pauza
 &Quit
-&Zamnkij
-&Resolve
-&Rozwiąż
+&Zamknij
 &Retry
 &Powtórz
 &Save
@@ -114,6 +114,8 @@
 <<	lewy plik jest nowszy\n
 <Directory>
 <Katalog>
+<Last session>
+<Ostatnia sesja>
 <multiple selection>
 <zaznaczone elementy>
 <|	file on left side only\n
@@ -125,7 +127,7 @@
 Abort
 Przerwij
 Abort requested: Waiting for current operation to finish...
-Rządanie przerwania: Czekaj na koniec aktualnie wykonywanego zadania...
+Żądanie przerwania: Czekaj na koniec aktualnie wykonywanego zadania...
 Aborted
 Przerwana
 About
@@ -144,8 +146,8 @@ As a result the files are separated into the following categories:
 W rezultacie pliki zostały podzielone na następujące kategorie:
 As the name suggests, two files which share the same name are marked as equal if and only if they have the same content. This option is useful for consistency checks rather than backup operations. Therefore the file times are not taken into account at all.\n\nWith this option enabled the decision tree is smaller:
 Jak wskazuje nazwa, dwa pliki o tej samej nazwie są równe tylko i wyłącznie jeżeli ich zawartość jest jednakowa. Czas modyfikacji nie jest brany pod uwagę. Ta opcja jest raczej użyteczna do sprawdzania spójności plików niż zadań kopii zapasowej.\n\nDrzewko decyzyjne dla tej opcji jest mniejsze:
-Assemble a batch file with the following settings. To start synchronization in batch mode simply execute this file or schedule it in your operating system's task planner.
-Utwórz zadanie batch z tymi ustawieniami. Aby rozpocząć synchronizację w tym trybie zwyczajnie uruchom plik lub dodaj go do zadań zaplanowanych Twojego systemu.
+Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.
+Twórz zadanie batch dla automatyzacji procesu. By rozpocząć prace w tym trybie zwyczajnie uruchom plik z zadaniem batch lub dodaj go do zadań zaplanowanych Twojego systemu. Plik batch może być również przekazywany jako parametr do programu w postaci: FreeFileSync.exe <batchfile>.
 Batch file created successfully!
 Plik Batch utworzony pomyślnie!
 Batch job
@@ -156,6 +158,8 @@ Build:
 Buduj:
 Cancel
 Anuluj
+Check all
+Sprawdź wszystko
 Choose to hide filtered files/directories from list
 Zaznacz aby ukryć przefiltrowane pliki/katalogi z listy
 Comma separated list
@@ -192,8 +196,6 @@ Configure your own synchronization rules.
 Skonfiguruj swoje własne zasady synchronizacji.
 Confirm
 Potwierdź
-Consider this when setting up synchronization rules: You might want to avoid write access to these directories so that synchronization of both does not interfere.
-Pamiętaj: Możesz zastrzec prawo do zapisu dla tych katalogów aby uniknąć ewentualej kolizji podczas synchronizacji.
 Continue
 Kontynuuj
 Conversion error:
@@ -205,7 +207,7 @@ Kopiuj z lewej do prawej nadpisując
 Copy from right to left
 Kopiuj z prawej do lewej
 Copy from right to left overwriting
-Kopij z prawej do lewej nadpisując
+Kopiuj z prawej do lewej nadpisując
 Copy new or updated files to right folder.
 Kopiuj nowe lub aktualniejsze pliki na prawą stronę.
 Copy to clipboard\tCTRL+C
@@ -244,14 +246,18 @@ Delete files/folders existing on right side only
 Usuń pliki/foldery istniejące tylko po prawej stronie
 Delete files\tDEL
 Usuń\tDEL
+Delete on both sides
+Usuń po obu stronach
+Delete on both sides even if the file is selected on one side only
+Usuń po obu stronach nawet jeżeli plik zaznaczony jest tylko po jednej stronie
 Delete:
 Usuń:
 Deleting file %x
 Usuwanie pliku %x
 Deleting folder %x
 Usuwanie folderu %x
-Directories are dependent:
-Katalogi są zależne:
+Directories are dependent! Be careful when setting up synchronization rules:
+Katalogi są zależne! Pamiętaj o tym podczas ustawiania zasad synchronizacji:
 Directory does not exist:
 Katalog nie istnieje:
 Do not show graphical status and error messages but write to a logfile instead
@@ -262,8 +268,8 @@ Do nothing
 Nic nie rób
 Do you really want to delete the following objects(s)?
 Czy na pewno chcesz usunąć wybrane obiekty?
-Do you really want to move the following objects(s) to the recycle bin?
-Czy na pewno chesz przenieść wybrane obiekty do kosza?
+Do you really want to move the following objects(s) to the Recycle Bin?
+Czy na pewno chcesz przenieść wybrane pliki do kosza?
 Donate with PayPal
 Wesprzyj z PayPal
 Drag && drop
@@ -282,16 +288,22 @@ Error deleting directory:
 Błąd podczas usuwania katalogu:
 Error deleting file:
 Błąd podczas usuwania pliku:
-Error moving to recycle bin:
+Error handling
+Obsługa błędów
+Error moving to Recycle Bin:
 Błąd podczas przenoszenia do kosza:
 Error parsing configuration file:
 Błąd podczas parsowania pliku konfiguracyjnego:
 Error reading file:
 Błąd podczas odczytu pliku:
+Error reading folder attributes:
+Błąd odczytu atrybutów folderu:
 Error traversing directory:
 Błąd podczas odczytywania katalogu:
 Error writing file:
 Błąd podczas zapisu do pliku:
+Error writing folder attributes:
+Błąd zapisu atrybutów folderu:
 Error: Source directory does not exist anymore:
 Błąd: Katalog źródłowy nie istnieje:
 Example
@@ -302,6 +314,10 @@ Exclude temporarily
 Wyklucz tymczasowo
 Exclude via filter:
 Dodaj filtr:
+Exit immediately and set returncode < 0
+Zakończ natychmiastowo i zwróć wartość < 0
+Exit with RC < 0
+Zakończ z RC < 0
 FAT32: Handle Daylight Saving Time
 FAT32: Uwzględnij przesunięcie czasu
 Feedback and suggestions are welcome at:
@@ -340,14 +356,14 @@ Files/folders that exist on left side only
 Pliki/katalogi istniejące tylko po lewej stronie
 Files/folders that exist on right side only
 Pliki/katalogi istniejące tylko po prawej stronie
-Filter
-Filtr
 Filter active: Press again to deactivate
 Filtr aktywny: Kliknij ponownie aby wyłączyć
 Filter files
 Filtruj pliki
 Filter view
 Filtr podglądu
+Folder Comparison and Synchronization
+Porównywanie i Synchronizacja folderów
 Folder pair
 Para folderów
 FreeFileSync - Folder Comparison and Synchronization
@@ -360,12 +376,16 @@ FreeFileSync batch file
 FreeFileSync plik batch
 FreeFileSync configuration
 Konfiguracja FreeFileSync
+Full name
+Pełna nazwa
 Generating file list...
 Generowanie listy plików...
 Global settings
 Ustawienia globalne
 Help
 Pomoc
+Hide all error and warning messages
+Ukryj wszystkie informacje błędach i ostrzeżeniach
 Hide files that are different
 Ukryj pliki, które są różne
 Hide files that are equal
@@ -392,12 +412,12 @@ If you like FFS:
 Jeżeli Ci się podoba:
 Ignore errors
 Ignoruj błędy
-Ignore next errors
+Ignore subsequent errors
 Ignoruj kolejne błędy
 Ignore this error, retry or abort synchronization?
 Ignoruj, powtórz albo przerwij synchronizacje.
 Ignore this error, retry or abort?
-Ignorować błąd, powtórzć albo zakończyć?
+Ignorować błąd, powtórzyć albo zakończyć?
 Include
 Dołącz
 Include temporarily
@@ -408,8 +428,6 @@ Info
 Info
 Information
 Informacja
-Information: If you ignore the error or abort a re-compare will be necessary!
-Informacja: Jeśli zignorujesz błąd albo zakończysz konieczne będzie ponowne porównanie!
 Initialization of Recycle Bin failed!
 Niepowodzenie inicjalizacji Kosza!
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
@@ -418,10 +436,10 @@ Left folder:
 Lewy folder:
 Legend
 Legenda
-Load configuration via...\n     - this list (press DEL to delete items)\n     - drag & drop to this window\n     - startup parameter
-Ładuj konfigurację przez...\n     - ta lista (DEL aby usunąć element)\n     - przeciągnij i upuść na to okno\n     - parametry startowe
-Load from file...
-Ładuj z pliku...
+Load configuration from file
+Wczytaj konfigurację z pliku
+Load configuration history (press DEL to delete items)
+Wczytaj historie konfiguracji (naciśnij Del aby usunąć element)
 Log-messages:
 Logi:
 Mirror ->>
@@ -433,7 +451,7 @@ Przesuń kolumnę w dół
 Move column up
 Przesuń kolumnę do góry
 Not all items were synchronized! Have a look at the list.
-Nie wszysktkie elementy zostały zsynchronizowane! Lista pominiętych plików.
+Nie wszystkie elementy zostały zsynchronizowane! Lista pominiętych plików.
 Nothing to synchronize according to configuration!
 Brak elementów do synchronizacji!
 Number of files and directories that will be created
@@ -470,6 +488,12 @@ Relative path
 Relatywna ścieżka
 Remove folder pair
 Usuń parę folderów
+Reset
+Resetuj
+Reset all warning messages?
+Zresetować wszystkie ostrzeżenia?
+Resets all warning messages
+Zresetuj wszystkie ostrzeżenia
 Result
 Rezultat
 Right folder:
@@ -491,7 +515,7 @@ Wybierz wariant:
 Show files that are different
 Pokaż pliki, które się różnią
 Show files that are equal
-Pokaż pliki, ktore są równe
+Pokaż pliki, które są równe
 Show files that are newer on left
 Pokaż pliki nowsze po lewej stronie
 Show files that are newer on right
@@ -500,6 +524,12 @@ Show files that exist on left side only
 Pokaż pliki istniejące tylko po lewej stronie
 Show files that exist on right side only
 Pokaż pliki istniejące tylko po prawej stronie
+Show popup
+Pokaż okno popup
+Show popup on errors or warnings
+Pokaż okno popup dla błędów i ostrzeżeń
+Significant difference detected: More than 50% of files will be overwritten/deleted!
+Wykryto znaczące zmiany: Ponad 50% plików zostanie nadpisane/usunięte!
 Silent mode
 Tryb Cichy
 Size
@@ -533,21 +563,23 @@ Synchronizuj wszystkie pliki .doc, .zip i .exe z wyjątkiem folderu \"temp\".
 Synchronize both sides simultaneously: Copy new or updated files in both directions.
 Synchronizuj obie strony jednocześnie: Kopiuj nowe albo uaktualniaj w obu folderach.
 Synchronizing...
-Synchronizuje...
+Synchronizuję...
 System out of memory!
 Brak pamięci!
 The file does not contain a valid configuration:
 Nieprawidłowy format pliku:
-The selected file does not exist:
-Zaznaczony plik nie istnieje:
+The file does not exist:
+Plik nie istnieje:
+This commandline will be executed each time you doubleclick on a filename. %name serves as a placeholder for the selected file.
+Ta komenda będzie wykonywana za każdym razem jak klikniesz dwa razy na dany plik. %name jest wskaźnikiem na katalog zaznaczonego pliku.
 This commandline will be executed each time you doubleclick on a filename. %x serves as a placeholder for the selected file.
-Ta linia będzie wykonywana za każdym razem jak będziesz eksplorował plik. %x jest wskaźnikiem na katalog zaznaczonego pliku.
+Ta komenda będzie wykonywana za każdym razem jak klikniesz dwa razy na dany plik. %x jest wskaźnikiem na katalog zaznaczonego pliku.
 This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time. Notice that the file time is allowed to deviate by up to 2 seconds. This ensures synchronization with the lower-precision file system FAT32 works correctly.
-Ten wariant traktuje dwa pliki jako równe w przypadku gdy mają jednakowy rozmiar oraz tą samą datę i czas ostatniej modyfikacji. Miej na uwadzę, że czas pliku może odbiegać od rzeczywistego o 2 sekundy. Jest to konieczne podczas synchronizacji dla plików w systemie FAT32.
+Ten wariant traktuje dwa pliki jako równe w przypadku gdy mają jednakowy rozmiar oraz tą samą datę i czas ostatniej modyfikacji. Miej na uwadze, że czas pliku może odbiegać od rzeczywistego o 2 sekundy. Jest to konieczne podczas synchronizacji dla plików w systemie FAT32.
+Time
+Czas
 Time elapsed:
 Czas:
-Time:
-Czas:
 Total amount of data that will be transferred
 Liczba danych do przekopiowania
 Total time:
@@ -558,6 +590,8 @@ Unable to create logfile!
 Nie można utworzyć pliku z logami!
 Unable to initialize Recycle Bin!
 Nie można zainicjalizować Kosz!
+Uncheck all
+Odznacz wszystko
 Update ->
 Uaktualnij ->
 Update:
diff --git a/Languages/portuguese.lng b/Languages/portuguese.lng
index 818ef2f7..a613c96d 100644
--- a/Languages/portuguese.lng
+++ b/Languages/portuguese.lng
@@ -1,4 +1,4 @@
-  MinGW \t- Windows port of GNU Compiler Collection\n  wxWidgets \t- Open-Source GUI framework\n  wxFormBuilder\t- wxWidgets GUI-builder\n  CodeBlocks \t- Open-Source IDE
+  MinGW \t- Windows port of GNU Compiler Collection\n  wxWidgets \t- Open-Source GUI framework\n  wxFormBuilder\t- wxWidgets GUI-builder\n  CodeBlocks \t- Open-Source IDE
   MinGW \t- Windows port of GNU Compiler Collection\n  wxWidgets \t- Open-Source GUI framework\n  wxFormBuilder\t- wxWidgets GUI-builder\n  CodeBlocks \t- Open-Source IDE
  Byte
  Byte
@@ -28,8 +28,8 @@
 &Sobre...
 &Advanced
 &Avançado
-&Back
-&Atrás
+&Apply
+&Aplicar
 &Cancel
 &Cancelar
 &Compare
@@ -50,6 +50,8 @@
 &Ignorar
 &Language
 &Língua
+&Load
+&Carregar
 &Load configuration
 &Carregar configuração
 &OK
@@ -58,8 +60,6 @@
 &Pausa
 &Quit
 &Sair
-&Resolve
-&Resolve
 &Retry
 &Tentar de Novo
 &Save
@@ -114,6 +114,8 @@
 <<	ficheiro à esquerda mais recente\n
 <Directory>
 <Directório>
+<Last session>
+<Última Sessão>
 <multiple selection>
 <Selecção Múltipla>
 <|	file on left side only\n
@@ -144,8 +146,10 @@ As a result the files are separated into the following categories:
 Como resultado, os ficheiros foram separados nas seguintes categorias:
 As the name suggests, two files which share the same name are marked as equal if and only if they have the same content. This option is useful for consistency checks rather than backup operations. Therefore the file times are not taken into account at all.\n\nWith this option enabled the decision tree is smaller:
 Como o nome sugere, dois ficheiros com o mesmo nome são assinalados iguais se e só se o seu conteúdo for idêntico. Esta opção é útil para controles de consistência mais do que para efeitos de backup. Portanto, a data dos ficheiros não é tomada em conta.\n\nCom esta opção, a arvoré de decisão é menor:
-Assemble a batch file with the following settings. To start synchronization in batch mode simply execute this file or schedule it in your operating system's task planner.
-Criar um ficheiro batch com as seguintes opções. Para iniciar a sincronização no modo batch, execute o ficheiro ou junte-o ao programador de tarefas do sistema operativo.
+Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.
+Criar um batch para sincronização automática. Para iniciar o modo batch, passar o nome do ficheiro para o executável do FreeFileSync: FreeFileSync.exe <ficheiro batch>. Também pode ser calendarizado no programador de tarefas.
+Batch execution
+Execução do batch
 Batch file created successfully!
 Ficheiro batch criado com sucesso!
 Batch job
@@ -156,6 +160,8 @@ Build:
 Criado:
 Cancel
 Cancelar
+Check all
+Verificar tudo
 Choose to hide filtered files/directories from list
 Ocultar itens filtrados da lista
 Comma separated list
@@ -192,8 +198,6 @@ Configure your own synchronization rules.
 Configure as suas regras de sincronização.
 Confirm
 Confirmar
-Consider this when setting up synchronization rules: You might want to avoid write access to these directories so that synchronization of both does not interfere.
-A considerar ao escolher as regras de sincronização: Pode querer evitar escrever sobre estas pastas para que a sincronização ocorra sem problemas.
 Continue
 Continuar
 Conversion error:
@@ -244,14 +248,18 @@ Delete files/folders existing on right side only
 Eliminar itens existentes apenas no lado direito
 Delete files\tDEL
 Eliminar ficheiros\tDEL
+Delete on both sides
+Eliminar em ambos os lados
+Delete on both sides even if the file is selected on one side only
+Eliminar em ambos os lados mesmo se o ficheiro só está seleccionado num lado
 Delete:
 Eliminar:
 Deleting file %x
 Apagar ficheiro %x
 Deleting folder %x
 Apagar pasta %x
-Directories are dependent:
-As pastas são dependentes:
+Directories are dependent! Be careful when setting up synchronization rules:
+Directórios são dependentes! Cuidado ao definir as regras de sincronização:
 Directory does not exist:
 A pasta não existe:
 Do not show graphical status and error messages but write to a logfile instead
@@ -262,8 +270,8 @@ Do nothing
 Não fazer nada
 Do you really want to delete the following objects(s)?
 Quer mesmo eliminar o(s) seguinte(s) item(s) ?
-Do you really want to move the following objects(s) to the recycle bin?
-Quer mesmo enviar o(s) seguinte(s) item(s) para a Reciclagem?
+Do you really want to move the following objects(s) to the Recycle Bin?
+Quer mesmo mover o(s) seguinte(s) objecto(s) para a Reciclagem?
 Donate with PayPal
 Doar usando PayPal
 Drag && drop
@@ -282,8 +290,10 @@ Error deleting directory:
 Erro ao eliminar a pasta:
 Error deleting file:
 Erro ao eliminar o ficheiro:
-Error moving to recycle bin:
-Erro ao mover para a Reciclagem:
+Error handling
+Controlador de erros
+Error moving to Recycle Bin:
+Erro ao mover para Reciclagem:
 Error parsing configuration file:
 Erro de leitura do ficheiro de configuração:
 Error reading file:
@@ -306,6 +316,10 @@ Exclude temporarily
 Excluir temporariamente
 Exclude via filter:
 Excluir por filtro:
+Exit immediately and set returncode < 0
+Sair imediatamente e enviar o código < 0
+Exit with RC < 0
+Sair com RC < 0
 FAT32: Handle Daylight Saving Time
 FAT32: Tratar Hora de Verão
 Feedback and suggestions are welcome at:
@@ -344,14 +358,14 @@ Files/folders that exist on left side only
 Ficheiros/pastas existentes somente à esquerda
 Files/folders that exist on right side only
 Ficheiros/pastas existentes somente à direita
-Filter
-Filtro
 Filter active: Press again to deactivate
 Filtro activo: Clique aqui para desactivar
 Filter files
 Filtrar ficheiros
 Filter view
 Filtrar vista
+Folder Comparison and Synchronization
+Comparação e Sincronização de pastas
 Folder pair
 Par de pastas
 FreeFileSync - Folder Comparison and Synchronization
@@ -364,12 +378,16 @@ FreeFileSync batch file
 FreeFileSync Ficheiro batch
 FreeFileSync configuration
 FreeFileSync configuração
+Full name
+Nome completo
 Generating file list...
 A gerar lista ficheiros...
 Global settings
 Opções
 Help
 Ajuda
+Hide all error and warning messages
+Ocultar todas as mensagens de erro ou aviso
 Hide files that are different
 Ocultar ficheiros diferentes
 Hide files that are equal
@@ -396,8 +414,8 @@ If you like FFS:
 SE gosta de FFS:
 Ignore errors
 Ignorar erros
-Ignore next errors
-Ignorar erros seguintes
+Ignore subsequent errors
+Ignorar erros subsequentes
 Ignore this error, retry or abort synchronization?
 Ignorar erro, tentar de novo ou abortar a sincronização?
 Ignore this error, retry or abort?
@@ -412,8 +430,6 @@ Info
 Info
 Information
 Informação
-Information: If you ignore the error or abort a re-compare will be necessary!
-Informação: Se ignorar o erro ou abortar, será necessário voltar a comparar!
 Initialization of Recycle Bin failed!
 Início da Reciclagem falhou!
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
@@ -422,10 +438,10 @@ Left folder:
 Pasta esquerda:
 Legend
 Legenda
-Load configuration via...\n     - this list (press DEL to delete items)\n     - drag & drop to this window\n     - startup parameter
-Carregar configuração via...\n     - esta lista (pressione DEL para apagar itens),\n     - pegar & largar para esta janela,\n     - parâmetros de arranque.
-Load from file...
-Carregar a partir de ficheiro...
+Load configuration from file
+Carregar configuração do ficheiro
+Load configuration history (press DEL to delete items)
+Carregar histórico de configuração (pressione DEL para apagar itens)
 Log-messages:
 Log de mensagens:
 Mirror ->>
@@ -474,6 +490,12 @@ Relative path
 Caminho
 Remove folder pair
 Remover o par de pastas
+Reset
+Reiniciar
+Reset all warning messages?
+Reiniciar mensagens de aviso?
+Resets all warning messages
+Reinicia mensagens de aviso
 Result
 Resultado
 Right folder:
@@ -504,6 +526,12 @@ Show files that exist on left side only
 Mostrar ficheiros existentes somente à esquerda
 Show files that exist on right side only
 Mostrar ficheiros existentes somente à direita
+Show popup
+Mostrar popups
+Show popup on errors or warnings
+Mostrar popup c/ erros ou avisos
+Significant difference detected: More than 50% of files will be overwritten/deleted!
+Diferença significativa detectada: Mais de 50% dos ficheiros serão substituídos/apagados!
 Silent mode
 Modo silencioso
 Size
@@ -542,16 +570,18 @@ System out of memory!
 Sistema sem memória!
 The file does not contain a valid configuration:
 O ficheiro não contém uma configuração válida:
-The selected file does not exist:
-O ficheiro seleccionado não existe:
+The file does not exist:
+O ficheiro não existe:
+This commandline will be executed each time you doubleclick on a filename. %name serves as a placeholder for the selected file.
+Esta linha de comandos será executada cada vez que fizer duplo click num ficheiro. %name serve para reservar o lugar do ficheiro seleccionado.
 This commandline will be executed each time you doubleclick on a filename. %x serves as a placeholder for the selected file.
 Esta linha de comandos será executada cada vez que fizer duplo click num ficheiro. %x serve para reservar o lugar do ficheiro seleccionado.
 This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time. Notice that the file time is allowed to deviate by up to 2 seconds. This ensures synchronization with the lower-precision file system FAT32 works correctly.
 Esta variante avalia dois ficheiros de nome igual como iguais quando têm o mesmo tamanho e a mesma data e hora de modificação. Atenção: É permitido um desvio de 2 segundos na hora, de maneira a assegurar a sincronização com sistema de ficheiros de baixa precisão FAT32.
+Time
+Hora
 Time elapsed:
 Tempo passado:
-Time:
-Hora:
 Total amount of data that will be transferred
 Volume de dados a ser transferido
 Total time:
@@ -562,6 +592,8 @@ Unable to create logfile!
 Não é possível criar ficheiro log!
 Unable to initialize Recycle Bin!
 Não é possível iniciar a Reciclagem!
+Uncheck all
+Deseleccionar todos
 Update ->
 Actualizar ->
 Update: