5.17

1 files changed, 459 insertions, 474 deletions

diff --git a/BUILD/Languages/slovenian.lng b/BUILD/Languages/slovenian.lng
index a5973b7c..e368737c 100644
--- a/BUILD/Languages/slovenian.lng
+++ b/BUILD/Languages/slovenian.lng
@@ -1,139 +1,167 @@
 <header>
-	<language name>Slovenščina</language name>
-	<translator>Matej Badalič</translator>
+	<language>Slovenščina</language>
+	<translator>Matej Badalič, Tine Mlakar</translator>
 	<locale>sl_SI</locale>
-	<flag file>slovenia.png</flag file>
-	<plural forms>4</plural forms>
-	<plural definition>n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3</plural definition>
+	<flag_image>flag_slovenia.png</flag_image>
+	<plural_form_count>4</plural_form_count>
+	<plural_definition>n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3</plural_definition>
 </header>
 
-<source>Searching for folder %x...</source>
-<target>Iskanje mape %x...</target>
+<source>Retrying operation after error:</source>
+<target></target>
 
-<source>Items processed:</source>
-<target>Obdelanih elementov:</target>
+<source>Both sides have changed since last synchronization.</source>
+<target>Obe strani sta se spremenili od zadnje sinhronizacije.</target>
 
-<source>Items remaining:</source>
-<target>Preostalih elementov:</target>
+<source>Cannot determine sync-direction:</source>
+<target>Ne morem določiti sinhronizacijske smeri.</target>
 
-<source>Total time:</source>
-<target>Celoten čas:</target>
+<source>No change since last synchronization.</source>
+<target>Ni sprememb od zadnje sinhronizacije.</target>
 
-<source>Cannot set directory lock for %x.</source>
-<target>Ne morem nastaviti zaklepanja imenikov za %x.</target>
+<source>The database entry is not in sync considering current settings.</source>
+<target>Glede na trenutne nastavitve vnos v podatkovni bazi ni sinhroniziran.</target>
 
-<source>Show in Explorer</source>
-<target>Prikaži v Raziskovalcu</target>
+<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
+<target>Nastavljanje privzetih smeri sinhronizacije: Stare datoteke bodo prepisane z novimi datotekami.</target>
 
-<source>Open with default application</source>
-<target>Odpri s privzeto aplikacijo</target>
+<source>Checking recycle bin availability for folder %x...</source>
+<target>Preverjam razpoložljivost koša za mapo %x...</target>
 
-<source>Browse directory</source>
-<target>Brskaj po imeniku</target>
+<source>Moving file %x to recycle bin</source>
+<target>Premikam datoteko %x v koš</target>
 
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Zahtevana je bila prekinitev: čakam, da se zaključi trenutna operacija...</target>
+<source>Moving folder %x to recycle bin</source>
+<target>Premikam mapo %x v koš</target>
 
-<source>Failure to create timestamp for versioning:</source>
-<target>Napaka pri ustvarjanju časovne oznake pri ustvarjanju različic:</target>
+<source>Moving symbolic link %x to recycle bin</source>
+<target>Premikam simbolično povezavo %x v koš</target>
 
-<source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Avtomatizirana sinhronizacija</target>
+<source>Deleting file %x</source>
+<target>Brisanje datoteke %x</target>
+
+<source>Deleting folder %x</source>
+<target>Brisanje mape %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>Brisanje simboličnih povezav %x</target>
+
+<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>Za naslednje mape Koš ni na voljo. Datoteke bodo zato dokončno izbrisane:</target>
+
+<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>Selected variant:</source>
-<target>Izbrana varianta:</target>
+<source>File %x does not contain a valid configuration.</source>
+<target>Datoteka %x ne vsebuje veljavnih nastavitev</target>
 
-<source>Select alternate comparison settings</source>
-<target>Izberite alternativne nastavitve primerjanja</target>
+<source>A folder input field is empty.</source>
+<target>Vnosno polje za mapo je prazno.</target>
 
-<source>Select alternate synchronization settings</source>
-<target>Izberite nadomestne nastavitve sinhronizacije</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target>Ustrezajoča mapa bo smatrana kot prazna.</target>
 
-<source>Filter is active</source>
-<target>Filter je aktiven</target>
+<source>Cannot find the following folders:</source>
+<target>Ne morem najti naslednjih map:</target>
 
-<source>No filter selected</source>
-<target>Noben filter ni izbran</target>
+<source>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
+<target>To napako, ki smatra vsako mapo kot prazno, lahko ignorirate. Mape bodo potem samodejno ustvarjene med sinhronizacijo.</target>
 
-<source>Remove alternate settings</source>
-<target>Odstrani nadomestne nastavitve</target>
+<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source>
+<target>Naslednje mape imajo odvisne poti. Bodite previdni pri nastavitvi sinhronizacijskih pravil:</target>
 
-<source>Clear filter settings</source>
-<target>Počisti nastavitve filtra</target>
+<source>File %x has an invalid date.</source>
+<target>Datoteka %x ima neveljaven datum.</target>
 
-<source>Copy</source>
-<target>Kopiraj</target>
+<source>Date:</source>
+<target>Datum:</target>
 
-<source>Paste</source>
-<target>Prilepi</target>
+<source>Files %x have the same date but a different size.</source>
+<target>Datoteki %x imata enak datum ampak različno velikost.</target>
 
-<source>Save as batch job</source>
-<target>Shrani kot paketno opravilo</target>
+<source>Size:</source>
+<target>Velikost:</target>
 
-<source>Comparison settings</source>
-<target>Nastavitve primerjanja</target>
+<source>Items differ in attributes only</source>
+<target>Elementi se razlikujejo samo v atributih</target>
 
-<source>Synchronization settings</source>
-<target>Nastavitve sinhronizacije</target>
+<source>Resolving symbolic link %x</source>
+<target>Razrešujem simbolično povezavo %x</target>
 
-<source>About</source>
-<target>O programu(1)</target>
+<source>Comparing content of files %x</source>
+<target>Primerjam vsebino datotek %x</target>
 
-<source>Confirm</source>
-<target>Potrdi</target>
+<source>Generating file list...</source>
+<target>Ustvarjam seznam datotek...</target>
 
-<source>Configure filter</source>
-<target>Konfiguriraj filter</target>
+<source>Starting comparison</source>
+<target>Začenjam primerjavo</target>
 
-<source>Global settings</source>
-<target>Globalne nastavitve</target>
+<source>Calculating sync directions...</source>
+<target>Preračunavam sinhronizacijske smeri...</target>
 
-<source>Find</source>
-<target>Najdi</target>
+<source>Out of memory.</source>
+<target>Zmanjkalo pomnilnika.</target>
 
-<source>Select time span</source>
-<target>Izberite časovni okvir</target>
+<source>Item exists on left side only</source>
+<target>Element obstaja samo na levi strani</target>
 
-<source>Invalid command line:</source>
-<target>Napačna ukazna vrstica:</target>
+<source>Item exists on right side only</source>
+<target>Element obstaja samo na desni strani</target>
 
-<source>Info</source>
-<target>Info</target>
+<source>Left side is newer</source>
+<target>Leva stran je novejša</target>
 
-<source>Warning</source>
-<target>Pozor</target>
+<source>Right side is newer</source>
+<target>Desna stran je novejša</target>
 
-<source>Fatal Error</source>
-<target>Usodna napaka</target>
+<source>Items have different content</source>
+<target>Elementi imajo različno vsebino</target>
 
-<source>Error Code %x:</source>
-<target>Koda napake %x:</target>
+<source>Both sides are equal</source>
+<target>Obe strani sta enaki</target>
 
-<source>Cannot resolve symbolic link %x.</source>
-<target>Ne morem razrešiti simbolične povezave %x.</target>
+<source>Conflict/item cannot be categorized</source>
+<target>Spor/element ne more biti kategoriziran</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>Copy new item to left</source>
+<target>Kopiraj nov element na levo</target>
 
-<source>%x MB</source>
-<target>%x MB</target>
+<source>Copy new item to right</source>
+<target>Kopiraj nov element na desno</target>
 
-<source>%x KB</source>
-<target>%x KB</target>
+<source>Delete left item</source>
+<target>Izbriši levi element</target>
 
-<source>%x GB</source>
-<target>%x GB</target>
+<source>Delete right item</source>
+<target>Izbriše desni element</target>
+
+<source>Move file on left</source>
+<target>Premakni datoteko na levo</target>
+
+<source>Move file on right</source>
+<target>Premakni datoteko na desno</target>
+
+<source>Overwrite left item</source>
+<target>Prepiši levi element</target>
+
+<source>Overwrite right item</source>
+<target>Prepiši desni element</target>
+
+<source>Do nothing</source>
+<target>Ne naredi ničesar</target>
+
+<source>Update attributes on left</source>
+<target>Posodobi atribute na levi</target>
+
+<source>Update attributes on right</source>
+<target>Posodobi atribute na desni</target>
 
 <source>Database file %x is incompatible.</source>
 <target>Datoteka podatkovne baze %x je nekompatibilna.</target>
@@ -147,9 +175,6 @@
 <source>Database file is corrupt:</source>
 <target>Datoteka podatkovne baze je poškodovana:</target>
 
-<source>Out of memory!</source>
-<target>Zmanjkalo pomnilnika!</target>
-
 <source>Cannot write file %x.</source>
 <target>Ne morem zapisati datoteke %x.</target>
 
@@ -159,8 +184,8 @@
 <source>Database files do not share a common session.</source>
 <target>Datoteke podatkovne baze si ne delijo skupne seje.</target>
 
-<source>An exception occurred!</source>
-<target>Zgodila se je napaka!</target>
+<source>Searching for folder %x...</source>
+<target>Iskanje mape %x...</target>
 
 <source>Cannot read file attributes of %x.</source>
 <target>Ne morem brati datotečnih atributov od %x.</target>
@@ -185,9 +210,41 @@
 <source>Creating file %x</source>
 <target>Ustvarjam datoteko %x</target>
 
+<source>Items processed:</source>
+<target>Obdelanih elementov:</target>
+
+<source>Items remaining:</source>
+<target>Preostalih elementov:</target>
+
+<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>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Napaka pri razčlenjevanju datoteke %x, vrstica %y, stolpec %z.</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target>Ne morem nastaviti zaklepanja imenikov za %x.</target>
+
 <source>Scanning:</source>
 <target>Pregledujem:</target>
 
@@ -208,12 +265,18 @@
 <source>/sec</source>
 <target>/sek</target>
 
-<source>File %x does not contain a valid configuration.</source>
-<target>Datoteka %x ne vsebuje veljavnih nastavitev</target>
-
 <source>Configuration file %x loaded partially only.</source>
 <target>Nastavitvena datoteka %x naložena samo delno.</target>
 
+<source>Show in Explorer</source>
+<target>Prikaži v Raziskovalcu</target>
+
+<source>Open with default application</source>
+<target>Odpri s privzeto aplikacijo</target>
+
+<source>Browse directory</source>
+<target>Brskaj po imeniku</target>
+
 <source>Cannot access Volume Shadow Copy Service.</source>
 <target>Ne morem dostopati do servisa Volume Shadow Copy</target>
 
@@ -223,18 +286,21 @@
 <source>Cannot load file %x.</source>
 <target>Ne morem naložiti datoteko %x.</target>
 
-<source>Path %x does not contain a volume name.</source>
-<target>Pot %x ne vsebuje ime volumna.</target>
+<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 volumna %x ni del imena datoteke %y!</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>
+
+<source>Failure to create timestamp for versioning:</source>
+<target>Napaka pri ustvarjanju časovne oznake pri ustvarjanju različic:</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>Ne morem brati naslednje XML elemente:</target>
 
-<source>Cannot find file %x.</source>
-<target>Ne morem najti datoteke %x.</target>
-
 <source>&Open...</source>
 <target>&Odpri...</target>
 
@@ -315,9 +381,18 @@ Ukaz se sproži če:
 <source>Cancel</source>
 <target>Prekliči</target>
 
+<source>RealtimeSync - Automated Synchronization</source>
+<target>RealtimeSync - Avtomatizirana sinhronizacija</target>
+
+<source>Warning</source>
+<target>Pozor</target>
+
 <source>Build: %x</source>
 <target>Izgradnja: %x</target>
 
+<source>About</source>
+<target>O programu(1)</target>
+
 <source>All files</source>
 <target>Vse datoteke</target>
 
@@ -327,29 +402,125 @@ Ukaz se sproži če:
 <source>&Exit</source>
 <target>&Izhod</target>
 
-<source>Monitoring active...</source>
-<target>Nadziranje aktivno...</target>
-
 <source>Waiting for missing directories...</source>
 <target>Čakam na manjkajoče imenike...</target>
 
-<source>A folder input field is empty.</source>
-<target>Vnosno polje za mapo je prazno.</target>
+<source>Invalid command line:</source>
+<target>Napačna ukazna vrstica:</target>
+
+<source>File content</source>
+<target>Vsebini datoteke</target>
+
+<source>File time and size</source>
+<target>Čas in velikost datoteke</target>
+
+<source> Two way </source>
+<target> Obojesmerno </target>
+
+<source>Mirror</source>
+<target>Zrcalno </target>
 
-<source>Synchronization aborted!</source>
-<target>Sinhronizacija prekinjena!</target>
+<source>Update</source>
+<target>Posodobi </target>
 
-<source>Synchronization completed with errors!</source>
-<target>Sinhronizacija se je končala z napakami!</target>
+<source>Custom</source>
+<target>Po meri</target>
+
+<source>Multiple...</source>
+<target>Večkratno...</target>
+
+<source>Moving file %x to %y</source>
+<target>Premikam datoteko %x v %y</target>
 
-<source>Synchronization completed with warnings.</source>
-<target>Sinhronizacija se je končala z opozorili.</target>
+<source>Moving folder %x to %y</source>
+<target>Premikam mapo %x v %y</target>
 
-<source>Nothing to synchronize!</source>
-<target>Nič za sinhronizirati!</target>
+<source>Moving symbolic link %x to %y</source>
+<target>Premikam simbolično povezavo %x v %y</target>
 
-<source>Synchronization completed successfully.</source>
-<target>Sinhronizacija se je uspešno končala.</target>
+<source>Removing old versions...</source>
+<target>Odstranjujem stare različice...</target>
+
+<source>Creating symbolic link %x</source>
+<target>Ustvarjam simbolično povezavo %x</target>
+
+<source>Creating folder %x</source>
+<target>Ustvarjam mapo %x</target>
+
+<source>Overwriting file %x</source>
+<target>Prepisujem datoteko %x</target>
+
+<source>Overwriting symbolic link %x</source>
+<target>Prepisujem simbolično povezavo %x</target>
+
+<source>Verifying file %x</source>
+<target>Preverjam datoteko %x</target>
+
+<source>Updating attributes of %x</source>
+<target>Posodabljam atribute od %x</target>
+
+<source>Cannot find %x.</source>
+<target>Ne morem najti %x.</target>
+
+<source>Target folder %x already existing.</source>
+<target>Ciljna mapa %x že obstaja.</target>
+
+<source>Target folder input field must not be empty.</source>
+<target>Vnosno polje za ciljno mapo ne sme biti prazno.</target>
+
+<source>Folder input field for versioning must not be empty.</source>
+<target>Vnosno polje za ustvarjanje različic ne sme biti prazno.</target>
+
+<source>Source folder %x not found.</source>
+<target>Izvorna mapa %x se ne najde.</target>
+
+<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>
+
+<source>Required:</source>
+<target>Zahtevano:</target>
+
+<source>Available:</source>
+<target>Na voljo:</target>
+
+<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
+<target>Spremenjena bo mapa, ki je del večkratnih parov map. Prosim preglejte nastavitve sinhronizacije.</target>
+
+<source>Synchronizing folder pair:</source>
+<target>Sinhroniziram par map:</target>
+
+<source>Generating database...</source>
+<target>Ustvarjam podatkovno bazo...</target>
+
+<source>Creating Volume Shadow Copy for %x...</source>
+<target>Ustvarjam Senčno kopijo nosilca za %x...</target>
+
+<source>Data verification error: %x and %y have different content.</source>
+<target>Napaka pri preverjanju podatkov: %x in %y imata drugačno vsebino.</target>
+
+<source>Synchronization aborted</source>
+<target>Sinhronizacija prekinjena</target>
+
+<source>Synchronization completed with errors</source>
+<target>Sinhronizacija se je končala z napakami</target>
+
+<source>Synchronization completed with warnings</source>
+<target>Sinhronizacija se je končala z opozorili</target>
+
+<source>Nothing to synchronize</source>
+<target>Nič za sinhronizirati</target>
+
+<source>Synchronization completed successfully</source>
+<target>Sinhronizacija se je uspešno končala</target>
 
 <source>Saving log file %x...</source>
 <target>Shranjujem datoteko beleženja %x...</target>
@@ -357,8 +528,8 @@ Ukaz se sproži če:
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
 <target>Pritisnite "Preklopi", da razrešite vprašanja v glavnem pogovornem oknu FreeFileSync.</target>
 
-<source>Switching to FreeFileSync main dialog...</source>
-<target>Preklapljam na FreeFileSync glavno pogovorno okno...</target>
+<source>Switching to FreeFileSync main dialog</source>
+<target>Preklapljam na FreeFileSync osrednje pogovorno okno</target>
 
 <source>A new version of FreeFileSync is available:</source>
 <target>Nova različica FreeFileSync je na voljo:</target>
@@ -366,29 +537,29 @@ Ukaz se sproži če:
 <source>Download now?</source>
 <target>Prenesem sedaj?</target>
 
-<source>FreeFileSync is up to date!</source>
-<target>FreeFileSync je posodobljen!</target>
+<source>New version found</source>
+<target>Najdena nova verzija</target>
 
-<source>Information</source>
-<target>Informacije</target>
+<source>&Download</source>
+<target>&Prenesi</target>
 
-<source>Unable to connect to sourceforge.net!</source>
-<target>Ne morem se povezati na sourceforge.net!</target>
+<source>FreeFileSync is up to date.</source>
+<target>FreeFileSync je posodobljen.</target>
 
-<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
-<target>Trenutno različico FreeFileSync ni moč najti na spletu! Ali želite ročno preveriti?</target>
+<source>Information</source>
+<target>Informacije</target>
 
-<source>Do you want FreeFileSync to automatically check for updates every week?</source>
-<target>Ali želite, da FreeFileSync samodejno preverja za posodobitve vsak teden?</target>
+<source>Unable to connect to sourceforge.net.</source>
+<target>Ne morem se povezati na sourceforge.net.</target>
 
-<source>(Requires an Internet connection!)</source>
-<target>(Zahteva povezavo z Internetom!)</target>
+<source>Cannot find current FreeFileSync version number online. Do you want to check manually?</source>
+<target>Na omrežju ne najdem obstoječe verzije FreeFileSync-a. Ali želite preveriti lastnoročno?</target>
 
-<source><Symlink></source>
-<target><Simbolična povezava></target>
+<source>Symlink</source>
+<target>Simbolična povezava</target>
 
-<source><Folder></source>
-<target><Mapa></target>
+<source>Folder</source>
+<target>Mapa</target>
 
 <source>Full path</source>
 <target>Polna pot</target>
@@ -411,18 +582,12 @@ Ukaz se sproži če:
 <source>Extension</source>
 <target>Razširitev</target>
 
-<source>Size:</source>
-<target>Velikost:</target>
-
-<source>Date:</source>
-<target>Datum:</target>
+<source>Category</source>
+<target>Kategorija</target>
 
 <source>Action</source>
 <target>Ukrep</target>
 
-<source>Category</source>
-<target>Kategorija</target>
-
 <source>Drag && drop</source>
 <target>Povleci && spusti</target>
 
@@ -441,6 +606,33 @@ Ukaz se sproži če:
 <source>Hibernate</source>
 <target>Hibernacija</target>
 
+<source>Selected variant:</source>
+<target>Izbrana varianta:</target>
+
+<source>Select alternate comparison settings</source>
+<target>Izberite alternativne nastavitve primerjanja</target>
+
+<source>Select alternate synchronization settings</source>
+<target>Izberite nadomestne nastavitve sinhronizacije</target>
+
+<source>Filter is active</source>
+<target>Filter je aktiven</target>
+
+<source>No filter selected</source>
+<target>Noben filter ni izbran</target>
+
+<source>Remove alternate settings</source>
+<target>Odstrani nadomestne nastavitve</target>
+
+<source>Clear filter settings</source>
+<target>Počisti nastavitve filtra</target>
+
+<source>Copy</source>
+<target>Kopiraj</target>
+
+<source>Paste</source>
+<target>Prilepi</target>
+
 <source>&New</source>
 <target>&Novo</target>
 
@@ -459,14 +651,14 @@ Ukaz se sproži če:
 <source>&Language</source>
 <target>&Jezik</target>
 
-<source>&Global settings...</source>
-<target>&Globalne nastavitve...</target>
-
 <source>&Export file list...</source>
 <target>&Izvozi seznam datotek...</target>
 
-<source>&Advanced</source>
-<target>&Napredno</target>
+<source>&Global settings...</source>
+<target>&Globalne nastavitve...</target>
+
+<source>&Tools</source>
+<target>&Orodja</target>
 
 <source>&Check now</source>
 <target>P&reveri zdaj</target>
@@ -474,12 +666,18 @@ Ukaz se sproži če:
 <source>Check &automatically once a week</source>
 <target>S&amodejno preveri enkrat tedensko</target>
 
-<source>Check for new version</source>
-<target>Preveri za novo različico</target>
+<source>Check for new &version</source>
+<target>Preveri, če obstaja nova &verzija</target>
 
 <source>Compare</source>
 <target>Primerjaj</target>
 
+<source>Comparison settings</source>
+<target>Nastavitve primerjanja</target>
+
+<source>Synchronization settings</source>
+<target>Nastavitve sinhronizacije</target>
+
 <source>Synchronize</source>
 <target>Sinhroniziraj</target>
 
@@ -492,6 +690,9 @@ Ukaz se sproži če:
 <source>Swap sides</source>
 <target>Zamenjaj strani</target>
 
+<source>Save as batch job</source>
+<target>Shrani kot paketno opravilo</target>
+
 <source>Hide excluded items</source>
 <target>Skrij izključene elemente</target>
 
@@ -534,53 +735,8 @@ Ukaz se sproži če:
 <source>&Pause</source>
 <target>&Premor</target>
 
-<source>Batch job</source>
-<target>Paketno opravilo</target>
-
-<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
-<target>Ustvari paketno datoteko za avtomatiziranje sinhronizacije. Dvokliknite to datoteko ali jo nastavite v razpored opravil vašega sistema: FreeFileSync.exe <ime opravila>.ffs_batch</target>
-
-<source>Help</source>
-<target>Pomoč</target>
-
-<source>Error handling</source>
-<target>Napaka pri obravnavanju</target>
-
-<source>Ignore</source>
-<target>Ignoriraj</target>
-
-<source>Hide all error and warning messages</source>
-<target>Skrij vsa obvestila o napakah in opozorilih</target>
-
-<source>Pop-up</source>
-<target>Pogovorno okno</target>
-
-<source>Show pop-up on errors or warnings</source>
-<target>Prikaži pojavne napaka ali opozorila</target>
-
-<source>Exit</source>
-<target>Izhod</target>
-
-<source>Abort synchronization on first error</source>
-<target>Prekini sinhronizacijo ob prvi napaki</target>
-
-<source>Show progress dialog</source>
-<target>Prikazuj pogovorno okno z napredkom</target>
-
-<source>Save log</source>
-<target>Shrani beleženje</target>
-
-<source>Select folder to save log files</source>
-<target>Izberite mapo za shranjevanje datotek beleženja</target>
-
-<source>Limit</source>
-<target>Omejitev</target>
-
-<source>Limit maximum number of log files</source>
-<target>Omeji maksimalno število datotek beleženja</target>
-
-<source>Select variant</source>
-<target>Izberite varianto</target>
+<source>Select a variant</source>
+<target>Izberite spremenljivko</target>
 
 <source>
 Files are found equal if
@@ -595,9 +751,6 @@ Datoteki sta enaki, če sta
 enaka
 </target>
 
-<source>File time and size</source>
-<target>Čas in velikost datoteke</target>
-
 <source>
 Files are found equal if
      - file content
@@ -609,39 +762,42 @@ Datoteki sta enaki, če
 enaka
 </target>
 
-<source>File content</source>
-<target>Vsebini datoteke</target>
-
 <source>Symbolic Link handling</source>
 <target>Rokovanje s simboličnimi povezavami</target>
 
+<source>Help</source>
+<target>Pomoč</target>
+
 <source>OK</source>
 <target>V redu</target>
 
-<source><- Two way -></source>
-<target><- Obojesmerno -></target>
-
 <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
 <target>Identificiraj in razširjaj spremembe na obeh straneh. Izbrisi, premiki in spori so samodejno zaznani z uporabo podatkovne baze.</target>
 
-<source>Mirror ->></source>
-<target>Zrcalno ->></target>
-
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>Zrcalna varnostna kopija leve mape. Desna mapa bo spremenjena, da se bo natančno ujemala z levo mapo po sinhronizaciji.</target>
 
-<source>Update -></source>
-<target>Posodobi -></target>
-
 <source>Copy new or updated files to right folder.</source>
 <target>Kopiraj nove ali posodobljene datoteke v desno mapo.</target>
 
-<source>Custom</source>
-<target>Po meri</target>
-
 <source>Configure your own synchronization rules.</source>
 <target>Konfigurirajte vaša lastna sinhronizacijska pravila.</target>
 
+<source>Error handling</source>
+<target>Napaka pri obravnavanju</target>
+
+<source>Ignore</source>
+<target>Ignoriraj</target>
+
+<source>Hide all error and warning messages</source>
+<target>Skrij vsa obvestila o napakah in opozorilih</target>
+
+<source>Pop-up</source>
+<target>Pogovorno okno</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Prikaži pojavne napaka ali opozorila</target>
+
 <source>Deletion handling</source>
 <target>Ravnanje pri brisanju</target>
 
@@ -666,23 +822,32 @@ enaka
 <source>Naming convention:</source>
 <target>Konvencija poimenovanja:</target>
 
-<source>Item exists on left side only</source>
-<target>Element obstaja samo na levi strani</target>
+<source>Batch job</source>
+<target>Paketno opravilo</target>
 
-<source>Item exists on right side only</source>
-<target>Element obstaja samo na desni strani</target>
+<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
+<target>Ustvari paketno datoteko za avtomatiziranje sinhronizacije. Dvokliknite to datoteko ali jo nastavite v razpored opravil vašega sistema: FreeFileSync.exe <ime opravila>.ffs_batch</target>
 
-<source>Left side is newer</source>
-<target>Leva stran je novejša</target>
+<source>Exit</source>
+<target>Izhod</target>
 
-<source>Right side is newer</source>
-<target>Desna stran je novejša</target>
+<source>Abort synchronization on first error</source>
+<target>Prekini sinhronizacijo ob prvi napaki</target>
 
-<source>Items have different content</source>
-<target>Elementi imajo različno vsebino</target>
+<source>Show progress dialog</source>
+<target>Prikazuj pogovorno okno z napredkom</target>
 
-<source>Conflict/item cannot be categorized</source>
-<target>Spor/element ne more biti kategoriziran</target>
+<source>Save log</source>
+<target>Shrani beleženje</target>
+
+<source>Select folder to save log files</source>
+<target>Izberite mapo za shranjevanje datotek beleženja</target>
+
+<source>Limit</source>
+<target>Omejitev</target>
+
+<source>Limit maximum number of log files</source>
+<target>Omeji maksimalno število datotek beleženja</target>
 
 <source>Source code written in C++ using:</source>
 <target>Izvorna koda napisana v C++ z uporabo:</target>
@@ -702,9 +867,6 @@ enaka
 <source>Homepage</source>
 <target>Domača stran</target>
 
-<source>FreeFileSync at Sourceforge</source>
-<target>FreeFileSync na Sourceforge</target>
-
 <source>Email</source>
 <target>Email</target>
 
@@ -719,11 +881,11 @@ enaka
 
 <source>
 Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories!
+Note: File names must be relative to base directories.
 </source>
 <target>
 Samo datoteke, ki ustrezajo vsem nastavitvam filtra bodo sinhronizirane.
-Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
+Opomba: Imena datoteka morajo biti relativna osnovnim imenikom.
 </target>
 
 <source>Include</source>
@@ -747,6 +909,9 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>&Clear</source>
 <target>P&očisti</target>
 
+<source>Global settings</source>
+<target>Globalne nastavitve</target>
+
 <source>Fail-safe file copy</source>
 <target>Kopiranje datotek varno pred odpovedjo</target>
 
@@ -777,9 +942,6 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>&Default</source>
 <target>&Privzeto</target>
 
-<source>Start synchronization</source>
-<target>Začni sinhronizacijo</target>
-
 <source>Variant</source>
 <target>Različica</target>
 
@@ -798,8 +960,20 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>&Find next</source>
 <target>&Najdi naslednje</target>
 
-<source>Main bar</source>
-<target>Glavna vrstica</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>
+
+<source>Select time span</source>
+<target>Izberite časovni okvir</target>
 
 <source>Folder pairs</source>
 <target>Pari map</target>
@@ -810,6 +984,9 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Configuration</source>
 <target>Konfiguracija</target>
 
+<source>Main bar</source>
+<target>Glavna vrstica</target>
+
 <source>Filter files</source>
 <target>Filtriraj datoteke</target>
 
@@ -870,11 +1047,8 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Exclude via filter:</source>
 <target>Izključi preko filtra:</target>
 
-<source><multiple selection></source>
-<target><mnogokratna izbira></target>
-
-<source>Delete</source>
-<target>Izbriši</target>
+<source>multiple selection</source>
+<target>mnogokratna izbira</target>
 
 <source>Include all</source>
 <target>Vključi vse</target>
@@ -903,14 +1077,14 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Show "%x"</source>
 <target>Prikaži "%x"</target>
 
-<source><Last session></source>
-<target><Zadnja seja></target>
+<source>Last session</source>
+<target>Zadnja seja</target>
 
 <source>Folder Comparison and Synchronization</source>
 <target>Primerjava in sinhronizacija imenika</target>
 
-<source>Configuration saved!</source>
-<target>Konfiguracija shranjena!</target>
+<source>Configuration saved</source>
+<target>Konfiguracija shranjena</target>
 
 <source>FreeFileSync batch</source>
 <target>FreeFileSync paket</target>
@@ -924,9 +1098,6 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Never save changes</source>
 <target>Nikoli ne shrani sprememb</target>
 
-<source>Configuration loaded!</source>
-<target>Konfiguracija naložena!</target>
-
 <source>Show files that exist on left side only</source>
 <target>Prikaži datoteke, ki obstajajo samo na levi</target>
 
@@ -972,20 +1143,17 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Set as default</source>
 <target>Nastavi kot privzeto</target>
 
-<source>Operation aborted!</source>
-<target>Operacija prekinjena!</target>
+<source>Operation aborted</source>
+<target>Operacija prekinjena</target>
 
-<source>All folders are in sync!</source>
-<target>Vse mape so sinhronizirane!</target>
+<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>Legend</source>
-<target>Legenda</target>
-
-<source>File list exported!</source>
-<target>Seznam datotek je bil izvožen!</target>
+<source>File list exported</source>
+<target>Seznam datotek je bil izvožen</target>
 
 <source>Searching for program updates...</source>
 <target>Iščem posodobitve programa...</target>
@@ -996,6 +1164,9 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>&Ignore</source>
 <target>&Ignoriraj</target>
 
+<source>Fatal Error</source>
+<target>Usodna napaka</target>
+
 <source>Don't show this warning again</source>
 <target>Ne prikaži več tega opozorila</target>
 
@@ -1017,6 +1188,9 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Comparing content...</source>
 <target>Primerjam vsebino...</target>
 
+<source>Info</source>
+<target>Info</target>
+
 <source>Paused</source>
 <target>Na premoru</target>
 
@@ -1123,18 +1297,18 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Leave as unresolved conflict</source>
 <target>Pusti kot nerešeni spor</target>
 
-<source>Time stamp</source>
-<target>Časovna oznaka</target>
-
-<source>Append a timestamp to each file name</source>
-<target>Dodaj časovno oznako k vsakemu imenu datoteke</target>
-
 <source>Replace</source>
 <target>Zamenjaj</target>
 
 <source>Move files and replace if existing</source>
 <target>Premakne datoteke in jih zamenja, če obstajajo</target>
 
+<source>Time stamp</source>
+<target>Časovna oznaka</target>
+
+<source>Append a timestamp to each file name</source>
+<target>Dodaj časovno oznako k vsakemu imenu datoteke</target>
+
 <source>Folder</source>
 <target>Mapa</target>
 
@@ -1177,9 +1351,6 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Cannot write modification time of %x.</source>
 <target>Ne morem zapisati časa spremembe od %x.</target>
 
-<source>Cannot find system function %x.</source>
-<target>Ne morem najti sistemske funkcije %x.</target>
-
 <source>Cannot read security context of %x.</source>
 <target>Ne morem prebrati varnostnega konteksta od %x.</target>
 
@@ -1195,8 +1366,11 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Cannot create directory %x.</source>
 <target>Ne morem ustvariti imenika %x.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>Ne morem kopirati simboličnih povezav %x v %y.</target>
+<source>Cannot create symbolic link %x.</source>
+<target>Ne morem ustvariti simbolične povezave %x.</target>
+
+<source>Cannot find system function %x.</source>
+<target>Ne morem najti sistemske funkcije %x.</target>
 
 <source>Cannot copy file %x to %y.</source>
 <target>Ne morem kopirati datoteke %x v %y.</target>
@@ -1204,15 +1378,15 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Type of item %x is not supported:</source>
 <target>Element tipa %x ni podprt:</target>
 
+<source>Cannot resolve symbolic link %x.</source>
+<target>Ne morem razrešiti simbolične povezave %x.</target>
+
 <source>Cannot open directory %x.</source>
 <target>Ne morem odpreti imenika %x.</target>
 
 <source>Cannot enumerate directory %x.</source>
 <target>Ne morem oštevilčiti imenika %x.</target>
 
-<source>Detected endless directory recursion.</source>
-<target>Zaznana neskončna imeniška rekurzija</target>
-
 <source>%x TB</source>
 <target>%x TB</target>
 
@@ -1252,6 +1426,9 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <pluralform>%x dni</pluralform>
 </target>
 
+<source>Failed to register to receive system messages.</source>
+<target>Neuspešna registracija za sprejem sistemskih sporočil.</target>
+
 <source>Cannot set privilege %x.</source>
 <target>Ne morem nastaviti privilegija %x.</target>
 
@@ -1261,204 +1438,12 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Cannot change process I/O priorities.</source>
 <target>Ne morem spremeniti V/I prioritet procesa.</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>Ne morem premakniti %x v Koš</target>
-
-<source>Both sides have changed since last synchronization!</source>
-<target>Obe strani sta se spremenili od zadnje sinhronizacije!</target>
-
-<source>Cannot determine sync-direction:</source>
-<target>Ne morem določiti sinhronizacijske smeri.</target>
-
-<source>No change since last synchronization!</source>
-<target>Ni sprememb od zadnje sinhronizacije!</target>
-
-<source>The corresponding database entries are not in sync considering current settings.</source>
-<target>Ustrezni vnosi v podatkovni bazi niso sinhronizirani pri upoštevanju trenutnih nastavitev.</target>
-
-<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
-<target>Nastavljanje privzetih smeri sinhronizacije: Stare datoteke bodo prepisane z novimi datotekami.</target>
-
-<source>Checking recycle bin availability for folder %x...</source>
-<target>Preverjam razpoložljivost koša za mapo %x...</target>
-
-<source>Moving file %x to recycle bin</source>
-<target>Premikam datoteko %x v koš</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>Premikam mapo %x v koš</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>Premikam simbolično povezavo %x v koš</target>
-
-<source>Deleting file %x</source>
-<target>Brisanje datoteke %x</target>
-
-<source>Deleting folder %x</source>
-<target>Brisanje mape %x</target>
-
-<source>Deleting symbolic link %x</source>
-<target>Brisanje simboličnih povezav %x</target>
-
-<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>Koš ni na voljo za naslednje poti! Namesto tega bodo datoteke trajno izbrisane:</target>
-
-<source>The corresponding folder will be considered as empty.</source>
-<target>Ustrezajoča mapa bo smatrana kot prazna.</target>
-
-<source>Cannot find the following folders:</source>
-<target>Ne morem najti naslednjih map:</target>
-
-<source>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
-<target>To napako, ki smatra vsako mapo kot prazno, lahko ignorirate. Mape bodo potem samodejno ustvarjene med sinhronizacijo.</target>
-
-<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
-<target>Imeniki so v odvisnosti! Bodite pozorni, ko nastavljate sinhronizacijska pravila:</target>
-
-<source>Start comparison</source>
-<target>Začni primerjavo</target>
-
-<source>Calculating sync directions...</source>
-<target>Preračunavam sinhronizacijske smeri...</target>
-
-<source>Conflict detected:</source>
-<target>Zaznan spor:</target>
-
-<source>File %x has an invalid date!</source>
-<target>Datoteka %x ima neveljaven datum!</target>
-
-<source>Files %x have the same date but a different size!</source>
-<target>Datoteki %x imata enak datum ampak različno velikost!</target>
-
-<source>Items differ in attributes only</source>
-<target>Elementi se razlikujejo samo v atributih</target>
-
-<source>Symbolic links %x have the same date but a different target.</source>
-<target>Simbolične povezave %x imajo isti datum, vendar različno tarčo.</target>
-
-<source>Comparing content of files %x</source>
-<target>Primerjam vsebino datotek %x</target>
-
-<source>Comparing files by content failed.</source>
-<target>Primerjava datotek po vsebini ni uspela.</target>
-
-<source>Generating file list...</source>
-<target>Ustvarjam seznam datotek...</target>
-
-<source>Both sides are equal</source>
-<target>Obe strani sta enaki</target>
-
-<source>Copy new item to left</source>
-<target>Kopiraj nov element na levo</target>
-
-<source>Copy new item to right</source>
-<target>Kopiraj nov element na desno</target>
-
-<source>Delete left item</source>
-<target>Izbriši levi element</target>
-
-<source>Delete right item</source>
-<target>Izbriše desni element</target>
-
-<source>Move file on left</source>
-<target>Premakni datoteko na levo</target>
-
-<source>Move file on right</source>
-<target>Premakni datoteko na desno</target>
-
-<source>Overwrite left item</source>
-<target>Prepiši levi element</target>
-
-<source>Overwrite right item</source>
-<target>Prepiši desni element</target>
-
-<source>Do nothing</source>
-<target>Ne naredi ničesar</target>
-
-<source>Update attributes on left</source>
-<target>Posodobi atribute na levi</target>
-
-<source>Update attributes on right</source>
-<target>Posodobi atribute na desni</target>
-
-<source>Multiple...</source>
-<target>Večkratno...</target>
-
-<source>Moving file %x to %y</source>
-<target>Premikam datoteko %x v %y</target>
-
-<source>Moving folder %x to %y</source>
-<target>Premikam mapo %x v %y</target>
+<source>Unable to move %x to the Recycle Bin.</source>
+<target>Ne morem premakniti %x v Koš.</target>
 
-<source>Moving symbolic link %x to %y</source>
-<target>Premikam simbolično povezavo %x v %y</target>
-
-<source>Removing old versions...</source>
-<target>Odstranjujem stare različice...</target>
-
-<source>Creating symbolic link %x</source>
-<target>Ustvarjam simbolično povezavo %x</target>
-
-<source>Creating folder %x</source>
-<target>Ustvarjam mapo %x</target>
-
-<source>Overwriting file %x</source>
-<target>Prepisujem datoteko %x</target>
-
-<source>Overwriting symbolic link %x</source>
-<target>Prepisujem simbolično povezavo %x</target>
-
-<source>Verifying file %x</source>
-<target>Preverjam datoteko %x</target>
-
-<source>Updating attributes of %x</source>
-<target>Posodabljam atribute od %x</target>
+<source>Cannot determine final path for %x.</source>
+<target>Ne morem določiti končne poti za %x.</target>
 
-<source>Cannot find %x.</source>
-<target>Ne morem najti %x.</target>
-
-<source>Target folder %x already existing.</source>
-<target>Ciljna mapa %x že obstaja.</target>
-
-<source>Target folder input field must not be empty.</source>
-<target>Vnosno polje za ciljno mapo ne sme biti prazno.</target>
-
-<source>Folder input field for versioning must not be empty.</source>
-<target>Vnosno polje za ustvarjanje različic ne sme biti prazno.</target>
-
-<source>Source folder %x not found.</source>
-<target>Izvorna mapa %x se ne najde.</target>
-
-<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>
-
-<source>Required:</source>
-<target>Zahtevano:</target>
-
-<source>Available:</source>
-<target>Na voljo:</target>
-
-<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
-<target>Spremenjena bo mapa, ki je del večkratnih parov map. Prosim preglejte nastavitve sinhronizacije.</target>
-
-<source>Synchronizing folder pair:</source>
-<target>Sinhroniziram par map:</target>
-
-<source>Generating database...</source>
-<target>Ustvarjam podatkovno bazo...</target>
-
-<source>Creating Volume Shadow Copy for %x...</source>
-<target>Ustvarjam Senčno kopijo nosilca za %x...</target>
-
-<source>Data verification error: Source and target file have different content!</source>
-<target>Napaka pri preverjanju podatkov: izvorna in ciljna datoteka imata različno vsebino!</target>
+<source>Error Code %x:</source>
+<target>Koda napake %x:</target>