5.11

1 files changed, 147 insertions, 120 deletions

diff --git a/BUILD/Languages/norwegian.lng b/BUILD/Languages/norwegian.lng
index 947406c8..8850a52b 100644
--- a/BUILD/Languages/norwegian.lng
+++ b/BUILD/Languages/norwegian.lng
@@ -31,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Avbrytelse forespurt: Venter på at gjeldende handling avsluttes...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target></target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatisk synkronisering</target>
 
@@ -55,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>Nullstill filterinnstillinger</target>
 
-<source>Create a batch job</source>
-<target>Opprett en batch-jobb</target>
+<source>Save as batch job</source>
+<target></target>
 
 <source>Comparison settings</source>
 <target>Innstillinger for sammenligning</target>
@@ -76,9 +79,6 @@
 <source>Global settings</source>
 <target>Felles innstillinger</target>
 
-<source>Summary</source>
-<target>Oppsummering</target>
-
 <source>Find</source>
 <target>Søk</target>
 
@@ -271,8 +271,8 @@
 <source>Select a folder</source>
 <target>Velg en mappe</target>
 
-<source>Delay [seconds]</source>
-<target>Vent [sekunder]</target>
+<source>Idle time [seconds]</source>
+<target></target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>Ventetid mellom forrige endring og utførelse av kommando</target>
@@ -321,38 +321,23 @@ Kommandoen utløses hvis:
 <source>A folder input field is empty.</source>
 <target>Et mappefelt er tomt.</target>
 
-<source>File time and size</source>
-<target>Fildato og størrelse</target>
-
-<source>File content</source>
-<target>Filinnhold</target>
-
-<source><Automatic></source>
-<target><Automatisk></target>
-
-<source>Mirror ->></source>
-<target>Speile ->></target>
-
-<source>Update -></source>
-<target>Oppdatere -></target>
-
-<source>Custom</source>
-<target>Brukerdefinert</target>
-
-<source>FreeFileSync batch</source>
-<target>FreeFileSync batch</target>
-
 <source>Synchronization aborted!</source>
 <target>Synkronisering avbrutt!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Synkronisering fullført med feil!</target>
 
+<source>Synchronization completed with warnings.</source>
+<target></target>
+
 <source>Nothing to synchronize!</source>
 <target>Ikke noe å synkronisere!</target>
 
-<source>Synchronization completed successfully!</source>
-<target>Synkronisering vellykket fullført!</target>
+<source>Synchronization completed successfully.</source>
+<target></target>
+
+<source>Saving log file %x...</source>
+<target></target>
 
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
 <target>Trykk "Skift" for å løse problemer i FreeFileSync hovedvindu.</target>
@@ -360,9 +345,6 @@ Kommandoen utløses hvis:
 <source>Switching to FreeFileSync main dialog...</source>
 <target>Skifter til FreeFileSync hovedvindu...</target>
 
-<source>Unable to connect to sourceforge.net!</source>
-<target>Ikke i stand til å koble til sourceforge.net!</target>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>En ny versjon av FreeFileSync er tilgjengelig</target>
 
@@ -375,6 +357,12 @@ Kommandoen utløses hvis:
 <source>Information</source>
 <target>Informasjon</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>Ikke i stand til å koble til sourceforge.net!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target></target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Skal FreeFileSync automatisk se etter oppdateringer hver uke?</target>
 
@@ -438,27 +426,27 @@ Kommandoen utløses hvis:
 <source>Hibernate</source>
 <target>Sett i dvalemodus</target>
 
-<source>1. &Compare</source>
-<target>1. Sammen&lign</target>
-
-<source>2. &Synchronize</source>
-<target>2. &Synkroniser</target>
-
 <source>&New</source>
 <target>&Ny</target>
 
 <source>&Save</source>
 <target>&Lagre</target>
 
+<source>Save as &batch job...</source>
+<target></target>
+
+<source>1. &Compare</source>
+<target>1. Sammen&lign</target>
+
+<source>2. &Synchronize</source>
+<target>2. &Synkroniser</target>
+
 <source>&Language</source>
 <target>&Språk</target>
 
 <source>&Global settings...</source>
 <target>&Felles innstillinger...</target>
 
-<source>&Create batch job...</source>
-<target>&Opprett batch-jobb...</target>
-
 <source>&Export file list...</source>
 <target>&Eksporter filliste...</target>
 
@@ -492,16 +480,16 @@ Kommandoen utløses hvis:
 <source>Swap sides</source>
 <target>Bytt sider</target>
 
-<source>Load configuration from file</source>
-<target>Last innstilling fra fil</target>
+<source>Open</source>
+<target></target>
 
-<source>Save current configuration to file</source>
-<target>Lagre gjeldende innstilling til fil</target>
+<source>Save</source>
+<target></target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Sist brukte innstillinger (trykk DEL for å fjerne fra liste)</target>
 
-<source>Show excluded items</source>
+<source>Hide excluded items</source>
 <target></target>
 
 <source>Show filtered or temporarily excluded files</source>
@@ -540,15 +528,6 @@ Kommandoen utløses hvis:
 <source>Help</source>
 <target>Hjelp</target>
 
-<source>Filter files</source>
-<target>Filtrer filer</target>
-
-<source>Left</source>
-<target>Venstre</target>
-
-<source>Right</source>
-<target>Høyre</target>
-
 <source>Error handling</source>
 <target>Feilhåndtering</target>
 
@@ -570,13 +549,13 @@ Kommandoen utløses hvis:
 <source>Abort synchronization on first error</source>
 <target></target>
 
-<source>On completion:</source>
-<target>Ved fullføring:</target>
+<source>On completion</source>
+<target></target>
 
 <source>Show progress dialog</source>
 <target>Vis dialogboks</target>
 
-<source>Generate log file</source>
+<source>Save log</source>
 <target></target>
 
 <source>Select folder to save log files</source>
@@ -588,11 +567,8 @@ Kommandoen utløses hvis:
 <source>Limit maximum number of log files</source>
 <target></target>
 
-<source>Batch settings</source>
-<target>Batch-innstillinger</target>
-
-<source>Compare by...</source>
-<target>Sammenlign etter...</target>
+<source>Select variant</source>
+<target></target>
 
 <source>
 Files are found equal if
@@ -607,6 +583,9 @@ Filer blir funnet like hvis
 er den samme
 </target>
 
+<source>File time and size</source>
+<target>Fildato og størrelse</target>
+
 <source>
 Files are found equal if
      - file content
@@ -618,24 +597,36 @@ Filer blir funnet like hvis
 er det samme
 </target>
 
+<source>File content</source>
+<target>Filinnhold</target>
+
 <source>Symbolic Link handling</source>
 <target>Symbolsk lenkehåndtering</target>
 
 <source>OK</source>
 <target>OK</target>
 
-<source>Select variant:</source>
-<target>Velg variant:</target>
+<source><- Two way -></source>
+<target></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>Identifiser og spre endringer på begge sider ved å bruke en database. Slettinger, navneendringer og konflikter blir automatisk oppdaget.</target>
 
+<source>Mirror ->></source>
+<target>Speile ->></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>Speilings-sikkerhetskopi av venstre mappe. Høyre mappe endres slik at den blir helt lik venstre mappe etter synkronisering.</target>
 
+<source>Update -></source>
+<target>Oppdatere -></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>Kopier nye og endrede filer til høyre mappe.</target>
 
+<source>Custom</source>
+<target>Brukerdefinert</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>Still inn dine egne synkroniseringsregler.</target>
 
@@ -651,8 +642,8 @@ er det samme
 <source>Recycle Bin</source>
 <target></target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Bruk papirkurv ved sletting eller filoverskrivning</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target></target>
 
 <source>Versioning</source>
 <target>Versjonshåndtering</target>
@@ -660,7 +651,7 @@ er det samme
 <source>Move time-stamped files into specified folder</source>
 <target></target>
 
-<source>Limit maximum number of versions per file</source>
+<source>Naming convention:</source>
 <target></target>
 
 <source>Configuration</source>
@@ -810,6 +801,9 @@ Merk: Filnavn må være relative til basismapper!
 <source>Overview</source>
 <target>Oversikt</target>
 
+<source>Filter files</source>
+<target>Filtrer filer</target>
+
 <source>Select view</source>
 <target>Velg visning</target>
 
@@ -861,9 +855,15 @@ Merk: Filnavn må være relative til basismapper!
 <source><Last session></source>
 <target><Siste økt></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>Mappesammenligning og synkronisering</target>
+
 <source>Configuration saved!</source>
 <target>Innstilling lagret!</target>
 
+<source>FreeFileSync batch</source>
+<target>FreeFileSync batch</target>
+
 <source>Never save changes</source>
 <target>Aldri lagre endringer</target>
 
@@ -876,9 +876,6 @@ Merk: Filnavn må være relative til basismapper!
 <source>Configuration loaded!</source>
 <target>Innstilling lastet!</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>Mappesammenligning og synkronisering</target>
-
 <source>Hide files that exist on left side only</source>
 <target>Skjul filer som bare finnes på venstre side</target>
 
@@ -1035,6 +1032,9 @@ Merk: Filnavn må være relative til basismapper!
 <source>Comparing content...</source>
 <target>Sammenligner innhold...</target>
 
+<source>Copy</source>
+<target></target>
+
 <source>Paused</source>
 <target>Pauset</target>
 
@@ -1107,14 +1107,14 @@ Merk: Filnavn må være relative til basismapper!
 <source>- folder part only</source>
 <target>- kun mapper</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- Andre sides motstykke til %name</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target></target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- Andre sides motstykke til %dir</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target></target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>Gjøre skjulte dialoger og advarselsmeldinger synlige igjen?</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target></target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1137,47 +1137,29 @@ Merk: Filnavn må være relative til basismapper!
 <source>Leave as unresolved conflict</source>
 <target>Etterlat som uløste konflikter</target>
 
-<source>Files</source>
-<target>Filer</target>
+<source>Replace</source>
+<target></target>
 
-<source>Percentage</source>
-<target>Prosent</target>
+<source>Move files and replace if existing</source>
+<target></target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target></target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target></target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target></target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target></target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 time</pluralform>
-<pluralform>%x timer</pluralform>
-</target>
+<source>Files</source>
+<target>Filer</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 dag</pluralform>
-<pluralform>%x dager</pluralform>
-</target>
+<source>Percentage</source>
+<target>Prosent</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>Kan ikke overvåke mappen %x.</target>
@@ -1227,6 +1209,9 @@ Merk: Filnavn må være relative til basismapper!
 <source>Cannot copy file %x to %y.</source>
 <target>Kan ikke kopiere filen %x til %y.</target>
 
+<source>Type of item %x is not supported:</source>
+<target></target>
+
 <source>Cannot open directory %x.</source>
 <target></target>
 
@@ -1236,6 +1221,42 @@ Merk: Filnavn må være relative til basismapper!
 <source>Detected endless directory recursion.</source>
 <target>Fant uendelig dyp mappestruktur (lenker til mapper høyere opp i strukturen)</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>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 time</pluralform>
+<pluralform>%x timer</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 dag</pluralform>
+<pluralform>%x dager</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>Kan ikke sette privilegie %x.</target>
 
@@ -1365,6 +1386,9 @@ Merk: Filnavn må være relative til basismapper!
 <source>Moving symbolic link %x to %y</source>
 <target>Flytter symbolsk lenke %x til %y</target>
 
+<source>Removing old versions...</source>
+<target></target>
+
 <source>Creating file %x</source>
 <target>Oppretter fil %x</target>
 
@@ -1386,6 +1410,9 @@ Merk: Filnavn må være relative til basismapper!
 <source>Updating attributes of %x</source>
 <target>Oppdaterer attributter til %x</target>
 
+<source>Target folder %x already existing.</source>
+<target>Målmappe %x eksisterer allerede.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>Feltet for målmappe kan ikke være tomt.</target>
 
@@ -1395,11 +1422,8 @@ Merk: Filnavn må være relative til basismapper!
 <source>Source folder %x not found.</source>
 <target>Kildemappe %x finnes ikke.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>Uløste konflikter finnes!</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>Du kan ignorere konflikter og fortsette synkronisering.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target></target>
 
 <source>Significant difference detected:</source>
 <target>Betydelig forskjell oppdaget:</target>
@@ -1419,12 +1443,15 @@ Merk: Filnavn må være relative til basismapper!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>En mappe vil endres som er en del av flere mappepar. Se over innstillingene for synkronisering.</target>
 
+<source>Left</source>
+<target>Venstre</target>
+
+<source>Right</source>
+<target>Høyre</target>
+
 <source>Synchronizing folder pair:</source>
 <target></target>
 
-<source>Target folder %x already existing.</source>
-<target>Målmappe %x eksisterer allerede.</target>
-
 <source>Generating database...</source>
 <target>Oppretter database...</target>