5.11

1 files changed, 173 insertions, 146 deletions

diff --git a/BUILD/Languages/scottish_gaelic.lng b/BUILD/Languages/scottish_gaelic.lng
index 24551a41..3e49bc3b 100644
--- a/BUILD/Languages/scottish_gaelic.lng
+++ b/BUILD/Languages/scottish_gaelic.lng
@@ -26,11 +26,14 @@
 <target>Fosgail leis an aplacaid bhunaiteach</target>
 
 <source>Browse directory</source>
-<target>Rùraich an t-eòlaire</target>
+<target>Rùraich am pasgan</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Tha thu airson sgur dheth: A' feitheamh gus an crìochnaich an gnìomh làithreach...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target>Cha b' urrainn dhuinn stampa-ama a chruthachadh airson versioning:</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Sioncronachadh fèin-obrachail</target>
 
@@ -55,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>Falamhaich roghainnean na criathraige</target>
 
-<source>Create a batch job</source>
-<target>Cruthaich batch job</target>
+<source>Save as batch job</source>
+<target>Sàbhail mar obair baidse</target>
 
 <source>Comparison settings</source>
 <target>Roghainnean a' choimeasaidh</target>
@@ -76,9 +79,6 @@
 <source>Global settings</source>
 <target>Na roghainnean uile-choitcheann</target>
 
-<source>Summary</source>
-<target>Gearr-chunntas</target>
-
 <source>Find</source>
 <target>Lorg</target>
 
@@ -160,10 +160,10 @@
 <target>Chan urrainn dhuinn greim fhaighinn air fiosrachadh a' phròiseis.</target>
 
 <source>Waiting while directory is locked (%x)...</source>
-<target>A' feitheamh fhad 's a tha an t-eòlaire glaiste (%x)...</target>
+<target>A' feitheamh fhad 's a tha am pasgan glaiste (%x)...</target>
 
 <source>Cannot set directory lock %x.</source>
-<target>Cha ghabh glas an eòlaire %x a shuidheachadh.</target>
+<target>Cha ghabh glas a' phasgain %x a shuidheachadh.</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -277,8 +277,8 @@
 <source>Select a folder</source>
 <target>Tagh pasgan</target>
 
-<source>Delay [seconds]</source>
-<target>Dàil [diogan]</target>
+<source>Idle time [seconds]</source>
+<target>Ùine 'na thàmh [seconds]</target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>An tàmh eadar an t-atharrachadh mu dheireadh agus gnìomhachadh na h-àithne</target>
@@ -322,43 +322,28 @@ Thèid an loidhne-àithne a chur gu dol:
 <target>A' cumail sùil...</target>
 
 <source>Waiting for missing directories...</source>
-<target>A' feitheamh ris na h-eòlairean a tha a dhìth...</target>
+<target>A' feitheamh ris na pasgain a tha a dhìth...</target>
 
 <source>A folder input field is empty.</source>
 <target>Tha co-dhiù aon raon pasgain ann a tha falamh.</target>
 
-<source>File time and size</source>
-<target>Ceann-là is meud</target>
-
-<source>File content</source>
-<target>Susbaint an fhaidhle</target>
-
-<source><Automatic></source>
-<target><Fèin-obrachail></target>
-
-<source>Mirror ->></source>
-<target>Sgàthanaich ->></target>
-
-<source>Update -></source>
-<target>Ùraich -></target>
-
-<source>Custom</source>
-<target>Gnàthaichte</target>
-
-<source>FreeFileSync batch</source>
-<target>FreeFileSync batch</target>
-
 <source>Synchronization aborted!</source>
 <target>Sguireadh dhen t-sioncronachadh!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Chaidh an sioncronachadh a choileanadh ach bha mearachdan ann!</target>
 
+<source>Synchronization completed with warnings.</source>
+<target>Chaidh a shioncronachadh ach bha rabhaidhean ann.</target>
+
 <source>Nothing to synchronize!</source>
 <target>Chan eil dad ri shioncronachadh!</target>
 
-<source>Synchronization completed successfully!</source>
-<target>Chaidh an sioncronachadh a choileanadh!</target>
+<source>Synchronization completed successfully.</source>
+<target>Chaidh a shioncronachadh.</target>
+
+<source>Saving log file %x...</source>
+<target>A' sàbhaladh faidhle an loga %x...</target>
 
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
 <target>Briog air "Gearr leum" gus duilgheadasan a rèiteachadh sa phrìomh-chòmhradh aig FreeFileSync.</target>
@@ -366,9 +351,6 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>Switching to FreeFileSync main dialog...</source>
 <target>A' gearradh leum gu prìomh-chòmhradh FreeFileSyncs...</target>
 
-<source>Unable to connect to sourceforge.net!</source>
-<target>Cha b' urrainn dhuinn ceangal a dhèanamh ri Sourceforge.net!</target>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>Tha tionndadh ùr de FreeFileSync ann:</target>
 
@@ -381,6 +363,12 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>Information</source>
 <target>Fiosrachadh</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>Cha b' urrainn dhuinn ceangal a dhèanamh ri Sourceforge.net!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target>Cha do lorg sinn àireamh an tionndaidh làithrich aig FreeFileSync air loidhne! A bheil thu airson a lorg a làimh?</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>A bheil thu airson 's gun doir FreeFileSync sùil gach seachdain ach a bheil ùrachadh ann?</target>
 
@@ -439,32 +427,32 @@ Thèid an loidhne-àithne a chur gu dol:
 <target>Clàraich a-mach</target>
 
 <source>Shut down</source>
-<target>Dùin sìos</target>
+<target>Dùin sìos an siostam</target>
 
 <source>Hibernate</source>
 <target>Geamhraich</target>
 
-<source>1. &Compare</source>
-<target>1. &Dèan coimeas</target>
-
-<source>2. &Synchronize</source>
-<target>2. &Dèan sioncronachadh</target>
-
 <source>&New</source>
 <target>Ù&r</target>
 
 <source>&Save</source>
 <target>&Sàbhail</target>
 
+<source>Save as &batch job...</source>
+<target>Sàbhail mar obair &baidse...</target>
+
+<source>1. &Compare</source>
+<target>1. &Dèan coimeas</target>
+
+<source>2. &Synchronize</source>
+<target>2. &Dèan sioncronachadh</target>
+
 <source>&Language</source>
 <target>&Cànan</target>
 
 <source>&Global settings...</source>
 <target>&Na roghainnean uile-choitcheann...</target>
 
-<source>&Create batch job...</source>
-<target>Cr&uthaich batch job...</target>
-
 <source>&Export file list...</source>
 <target>Às-p&hortaich liosta nam faidhle...</target>
 
@@ -498,17 +486,17 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>Swap sides</source>
 <target>Cuir an dà thaobh an àite a chèile</target>
 
-<source>Load configuration from file</source>
-<target>Luchdaich an rèiteachadh on fhaidhle</target>
+<source>Open</source>
+<target>Fosgail</target>
 
-<source>Save current configuration to file</source>
-<target>Sàbhail an rèiteachadh làithreach ann am faidhle</target>
+<source>Save</source>
+<target>Sàbhail</target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>An rèiteachadh mu dheireadh a chaidh a chleachdadh (brùth DEL gus rudan a thoirt air falbh on liosta)</target>
 
-<source>Show excluded items</source>
-<target>Seall an fheadhainn a tha 'ga dhùnadh a-mach</target>
+<source>Hide excluded items</source>
+<target>Falaich nithean a chaidh a dhùnadh às</target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>Seall faidhlichean a tha 'gan dùnadh a-mach no air an criathradh a-mach an-dràsta fhèin</target>
@@ -538,7 +526,7 @@ Thèid an loidhne-àithne a chur gu dol:
 <target>An ùine a dh'fhalbh:</target>
 
 <source>Batch job</source>
-<target>Batch job</target>
+<target>Obair baidse</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>Cruthaich faidhle batch airson sioncronachadh fèin-obrachail. Dèan briogadh dùbailte air an fhaidhle seo no cuir e air sgeideal an t-siostaim agad: FreeFileSync.exe <Jobname>.ffs_batch.</target>
@@ -546,15 +534,6 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>Help</source>
 <target>Cobhair</target>
 
-<source>Filter files</source>
-<target>Criathraich na faidhlichean</target>
-
-<source>Left</source>
-<target>Clì</target>
-
-<source>Right</source>
-<target>Deas</target>
-
 <source>Error handling</source>
 <target>Làimhseachadh mhearachdan</target>
 
@@ -576,14 +555,14 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>Abort synchronization on first error</source>
 <target>Sguir dhen t-sioncronachadh nuair a thachras a' chiad mhearachd</target>
 
-<source>On completion:</source>
-<target>Nuair a bhios e deiseil:</target>
+<source>On completion</source>
+<target>Nuair a bhios e deiseil</target>
 
 <source>Show progress dialog</source>
 <target>Seall còmhradh an adhartais</target>
 
-<source>Generate log file</source>
-<target>Gin faidhle an loga</target>
+<source>Save log</source>
+<target>Sàbhail an loga</target>
 
 <source>Select folder to save log files</source>
 <target>Tagh pasgan far an dèid faidhlichean an loga a shàbhaladh</target>
@@ -594,11 +573,8 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>Limit maximum number of log files</source>
 <target>Cuingich an àireamh as motha de dh'fhaidhlichean an loga</target>
 
-<source>Batch settings</source>
-<target>Roghainnean a' batch</target>
-
-<source>Compare by...</source>
-<target>Dèan coimeas a-rèir...</target>
+<source>Select variant</source>
+<target>Tagh fear</target>
 
 <source>
 Files are found equal if
@@ -613,6 +589,9 @@ Bidh dà fhaidhle co-ionnann 'nar beachd-sa
 co-ionnann
 </target>
 
+<source>File time and size</source>
+<target>Ceann-là is meud</target>
+
 <source>
 Files are found equal if
      - file content
@@ -623,24 +602,36 @@ Bidh dà fhaidhle co-ionnann 'nar beachd-sa
      - susbaint an dà fhaidhle co-ionnann
 </target>
 
+<source>File content</source>
+<target>Susbaint an fhaidhle</target>
+
 <source>Symbolic Link handling</source>
 <target>Làimhseachadh nan symbolic links</target>
 
 <source>OK</source>
 <target>Ceart ma-thà</target>
 
-<source>Select variant:</source>
-<target>Tagh seòrsa:</target>
+<source><- Two way -></source>
+<target><- An dà chomhair -></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>Lorg is cuir an sàs atharraichean air an dà thaobh le stòr-dàta. Mothaichear do rudan a chaidh sguabadh às, a chaidh ainmean ùra a thoirt orra no còmhstrithean gu fèin-obrachail.</target>
 
+<source>Mirror ->></source>
+<target>Sgàthanaich ->></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>Dèan lethbhreac-glèidhidh 's tu a' sgàthanadh a' phasgain air an taobh chlì. Thèid am pasgan air an taobh deas a chur air gleus ach am bi e gu tur co-ionnann ris a' phasgan air an taobh chlì as dèidh dha sioncronachadh.</target>
 
+<source>Update -></source>
+<target>Ùraich -></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>Cuir lethbhreac de dh'fhaidhlichean a tha ùr no ùraichte dhan phasgan air an taobh deas.</target>
 
+<source>Custom</source>
+<target>Gnàthaichte</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>Sònraich riaghailtean sioncronachaidh thu fhèin.</target>
 
@@ -656,8 +647,8 @@ Bidh dà fhaidhle co-ionnann 'nar beachd-sa
 <source>Recycle Bin</source>
 <target>Am biona ath-chuairteachaidh</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Cleachd am biona ath-chuairteachaidh nuair a thèid faidhlichean a sguabadh às no ma thèid sgrìobhadh thairis orra</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target>Cuir na chaidh a sguabadh as no sgrìobhadh thairis air sa bhiona ath-chuairteachaidh</target>
 
 <source>Versioning</source>
 <target>Versioning</target>
@@ -665,8 +656,8 @@ Bidh dà fhaidhle co-ionnann 'nar beachd-sa
 <source>Move time-stamped files into specified folder</source>
 <target>Gluais faidhlichean air a bheil stampa ama do phasgain shònraichte</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>Cuingich an àireamh as motha de thionndaidhean airson gach faidhle</target>
+<source>Naming convention:</source>
+<target>Gnàthas nan ainmean:</target>
 
 <source>Configuration</source>
 <target>Rèiteachadh</target>
@@ -734,7 +725,7 @@ Note: File names must be relative to base directories!
 </source>
 <target>
 Cha dèid ach na faidhlichean a fhreagras ri gach roghainn na criathraige a shioncronachadh.
-An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairean aca!
+An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain aca!
 </target>
 
 <source>Include</source>
@@ -815,6 +806,9 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>Overview</source>
 <target>Foir-shealladh</target>
 
+<source>Filter files</source>
+<target>Criathraich na faidhlichean</target>
+
 <source>Select view</source>
 <target>Tagh sealladh</target>
 
@@ -866,9 +860,15 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source><Last session></source>
 <target><An seisean mu dheireadh></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>Coimeas eadar na pasgain is sioncronachadh</target>
+
 <source>Configuration saved!</source>
 <target>Chaidh an rèiteachadh a shàbhaladh!</target>
 
+<source>FreeFileSync batch</source>
+<target>FreeFileSync batch</target>
+
 <source>Never save changes</source>
 <target>Na sàbhail atharraichean idir</target>
 
@@ -881,9 +881,6 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>Configuration loaded!</source>
 <target>Chaidh an rèiteachadh a luchdadh!</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>Coimeas eadar na pasgain is sioncronachadh</target>
-
 <source>Hide files that exist on left side only</source>
 <target>Na falaich ach faidhlichean a tha air an taobh chlì a-mhàin</target>
 
@@ -996,10 +993,10 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <pluralform>%x directories</pluralform>
 </source>
 <target>
-<pluralform>%x eòlaire</pluralform>
-<pluralform>%x eòlaire</pluralform>
-<pluralform>%x eòlairean</pluralform>
-<pluralform>%x eòlaire</pluralform>
+<pluralform>%x phasgan</pluralform>
+<pluralform>%x phasgan</pluralform>
+<pluralform>%x pasgain</pluralform>
+<pluralform>%x pasgan</pluralform>
 </target>
 
 <source>
@@ -1048,6 +1045,9 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>Comparing content...</source>
 <target>A' dèanamh coimeas eadar an cuid susbaint...</target>
 
+<source>Copy</source>
+<target>Dèan lethbhreac</target>
+
 <source>Paused</source>
 <target>'Na stad</target>
 
@@ -1120,14 +1120,14 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>- folder part only</source>
 <target>- cuid a' phasgain a-mhàin</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- seise %s an taoibh eile</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target>- Seise %item_folder% aig a' choimpiutair eile</target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- seise %dir an taoibh eile</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target>- Seise %item_folder% aig a' choimpiutair eile</target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>A bheil thu airson na còmhraidhean is rabhaidhean falaichte fhaicinn a-rithist?</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target>A bheil thus airson na rabhaidhean 's còmraidhean falaichte fhaicinn a-rithist?</target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1154,53 +1154,29 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>Leave as unresolved conflict</source>
 <target>Fàg mar còmhstri gun rèiteachadh</target>
 
-<source>Files</source>
-<target>Faidhlichean</target>
+<source>Replace</source>
+<target>Cuir 'na àite</target>
 
-<source>Percentage</source>
-<target>Ceudad</target>
+<source>Move files and replace if existing</source>
+<target>Gluais na faidhlichean 's cuir iad an àite na feadhainn làithreach ma tha gin ann</target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target>Cuir stampa-ama ris ainm gach faidhle</target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target>Pasgan</target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target>Faidhle</target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>%x mhionaid</pluralform>
-<pluralform>%x mhionaid</pluralform>
-<pluralform>%x mionaidean</pluralform>
-<pluralform>%x mionaid</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target>BBBB-MM-LL uummdd</target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>%x uair a thìde</pluralform>
-<pluralform>%x uair a thìde</pluralform>
-<pluralform>%x uairean a thìde</pluralform>
-<pluralform>%x uair a thìde</pluralform>
-</target>
+<source>Files</source>
+<target>Faidhlichean</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>%x latha</pluralform>
-<pluralform>%x latha</pluralform>
-<pluralform>%x làithean</pluralform>
-<pluralform>%x latha</pluralform>
-</target>
+<source>Percentage</source>
+<target>Ceudad</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>Chan urrainn dhuinn sùil a chumail air %x.</target>
@@ -1218,7 +1194,7 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <target>Cha ghabh am faidhle %x a ghluasad dha %y.</target>
 
 <source>Cannot delete directory %x.</source>
-<target>Cha ghabh an t-eòlaire %x a sguabadh às.</target>
+<target>Cha ghabh am pasgan %x a sguabadh às.</target>
 
 <source>Cannot write file attributes of %x.</source>
 <target>Chan urrainn dhuinn buadhan an fhaidhle %x a sgrìobhadh.</target>
@@ -1242,7 +1218,7 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <target>Cha ghabh ceadan %x a sgrìobhadh.</target>
 
 <source>Cannot create directory %x.</source>
-<target>Cha ghabh an t-eòlaire %x a chruthachadh.</target>
+<target>Cha ghabh am pasgan %x a chruthachadh.</target>
 
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>Chan ghabh lethbhreac dhen symbolic link %x a chur gu %y.</target>
@@ -1250,14 +1226,59 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>Cannot copy file %x to %y.</source>
 <target>Cha ghabh lethbhreac an fhaidhle %x a chur gu %y.</target>
 
+<source>Type of item %x is not supported:</source>
+<target>Chan eil taic ri nì dhen t-seòrsa %x:</target>
+
 <source>Cannot open directory %x.</source>
-<target>Cha ghabh an t-eòlaire %x fhosgladh.</target>
+<target>Cha ghabh am pasgan %x fhosgladh.</target>
 
 <source>Cannot enumerate directory %x.</source>
-<target>Cha ghabh an t-eòlaire %x àireamhachadh.</target>
+<target>Cha ghabh am pasgan %x àireamhachadh.</target>
 
 <source>Detected endless directory recursion.</source>
-<target>Mhothaich sinn dha ath-chùrsadh eòlaire gun chrìoch.</target>
+<target>Mhothaich sinn dha ath-chùrsadh phasgan gun chrìoch.</target>
+
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>%x mhionaid</pluralform>
+<pluralform>%x mhionaid</pluralform>
+<pluralform>%x mionaidean</pluralform>
+<pluralform>%x mionaid</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>%x uair a thìde</pluralform>
+<pluralform>%x uair a thìde</pluralform>
+<pluralform>%x uairean a thìde</pluralform>
+<pluralform>%x uair a thìde</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>%x latha</pluralform>
+<pluralform>%x latha</pluralform>
+<pluralform>%x làithean</pluralform>
+<pluralform>%x latha</pluralform>
+</target>
 
 <source>Cannot set privilege %x.</source>
 <target>Cha ghabh a' phribhleid %x a shuidheachadh.</target>
@@ -1290,7 +1311,7 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <target>Chan urrainn dhuinn am pasgan %x a lorg.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
-<target>Tha eòlairean an eisimeil a chèile! Bi faiceallach nuair a shuidhicheas tu na riaghailtean sioncronachaidh:</target>
+<target>Tha na pasgain an eisimeil a chèile! Bi faiceallach nuair a shuidhicheas tu na riaghailtean sioncronachaidh:</target>
 
 <source>Start comparison</source>
 <target>Dèan coimeas</target>
@@ -1388,6 +1409,9 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>Moving symbolic link %x to %y</source>
 <target>A' gluasad an symbolic link %x gu %y</target>
 
+<source>Removing old versions...</source>
+<target>A' toirt air falbh nan seann tionndaidhean...</target>
+
 <source>Creating file %x</source>
 <target>A' cruthachadh an fhaidhle %x</target>
 
@@ -1409,6 +1433,9 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>Updating attributes of %x</source>
 <target>Ag ùrachadh buadhan %x</target>
 
+<source>Target folder %x already existing.</source>
+<target>Tha am pasgan-uidhe %x ann mu thràth.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>Chan fhaod raon a' phasgain a bhith falamh.</target>
 
@@ -1418,11 +1445,8 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>Source folder %x not found.</source>
 <target>Cha deach am pasgan tùsail %x a lorg.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>Tha còmhstrithean gun rèiteachadh ann!</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>'S urrainn dhut na còmhstrithean a leigeil seachad is leantainn air an t-sioncronachadh.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>Tha còmstrithean aig na nithean a leanas fhathast is cha dèid an sioncronachadh:</target>
 
 <source>Significant difference detected:</source>
 <target>Chaidh diofar mòr a lorg:</target>
@@ -1442,12 +1466,15 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Thèid pasgan atharrachadh a tha 'na phàirt de dh'iomadh paidhir de phasgain. Nach doir thu sùil air roghainnean an t-sioncronachaidh?</target>
 
+<source>Left</source>
+<target>Clì</target>
+
+<source>Right</source>
+<target>Deas</target>
+
 <source>Synchronizing folder pair:</source>
 <target>A' sioncronachadh paidhir nam pasgan:</target>
 
-<source>Target folder %x already existing.</source>
-<target>Tha am pasgan-uidhe %x ann mu thràth.</target>
-
 <source>Generating database...</source>
 <target>A' gintinn an stòir-dhàta...</target>