5.16

1 files changed, 85 insertions, 97 deletions

diff --git a/BUILD/Languages/norwegian.lng b/BUILD/Languages/norwegian.lng
index c85b7f9f..d453b110 100644
--- a/BUILD/Languages/norwegian.lng
+++ b/BUILD/Languages/norwegian.lng
@@ -115,14 +115,11 @@
 <source>Cannot resolve symbolic link %x.</source>
 <target>Kan ikke følge symbolsk lenke %x.</target>
 
-<source>%x MB</source>
-<target>%x MB</target>
-
-<source>%x KB</source>
-<target>%x KB</target>
+<source>Cannot determine final path for %x.</source>
+<target></target>
 
-<source>%x GB</source>
-<target>%x GB</target>
+<source>Cannot find system function %x.</source>
+<target>Kan ikke finne systemfunksjonen %x.</target>
 
 <source>
 <pluralform>1 Byte</pluralform>
@@ -133,6 +130,15 @@
 <pluralform>%x Bytes</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>Database file %x is incompatible.</source>
 <target>Databasefil %x er inkompatibel.</target>
 
@@ -169,9 +175,6 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>Venter mens mappe er låst (%x)...</target>
 
-<source>Creating file %x</source>
-<target>Oppretter fil %x</target>
-
 <source>
 <pluralform>1 sec</pluralform>
 <pluralform>%x sec</pluralform>
@@ -181,15 +184,15 @@
 <pluralform>%x sekunder</pluralform>
 </target>
 
+<source>Creating file %x</source>
+<target>Oppretter fil %x</target>
+
 <source>Error parsing file %x, row %y, column %z.</source>
 <target>Feil ved analysering av fil %x, rekke %y, kolonne %z.</target>
 
 <source>Scanning:</source>
 <target>Skanner:</target>
 
-<source>Encoding extended time information: %x</source>
-<target>Koder utvided tidsinformasjon: %x</target>
-
 <source>
 <pluralform>[1 Thread]</pluralform>
 <pluralform>[%x Threads]</pluralform>
@@ -199,6 +202,9 @@
 <pluralform>[%x Tråder]</pluralform>
 </target>
 
+<source>Encoding extended time information: %x</source>
+<target>Koder utvided tidsinformasjon: %x</target>
+
 <source>/sec</source>
 <target>/sekund</target>
 
@@ -411,12 +417,12 @@ Kommandoen utløses hvis:
 <source>Date:</source>
 <target>Dato:</target>
 
-<source>Action</source>
-<target>Handling</target>
-
 <source>Category</source>
 <target>Kategori</target>
 
+<source>Action</source>
+<target>Handling</target>
+
 <source>Drag && drop</source>
 <target>Dra && slipp</target>
 
@@ -792,12 +798,6 @@ Merk: Filnavn må være relative til basismapper!
 <source>&Find next</source>
 <target>&Søk neste</target>
 
-<source>Operation aborted!</source>
-<target>Handling avbrutt!</target>
-
-<source>Main bar</source>
-<target>Hovedverktøylinje</target>
-
 <source>Folder pairs</source>
 <target>Mappepar</target>
 
@@ -807,6 +807,9 @@ Merk: Filnavn må være relative til basismapper!
 <source>Configuration</source>
 <target>Innstilling</target>
 
+<source>Main bar</source>
+<target>Hovedverktøylinje</target>
+
 <source>Filter files</source>
 <target>Filtrer filer</target>
 
@@ -822,6 +825,30 @@ Merk: Filnavn må være relative til basismapper!
 <source>Compare both sides</source>
 <target>Sammenlign begge sider</target>
 
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 mappe</pluralform>
+<pluralform>%x mapper</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 fil</pluralform>
+<pluralform>%x filer</pluralform>
+</target>
+
+<source>
+<pluralform>%y of 1 row in view</pluralform>
+<pluralform>%y of %x rows in view</pluralform>
+</source>
+<target></target>
+
 <source>Set direction:</source>
 <target>Still inn retningen:</target>
 
@@ -936,48 +963,21 @@ Merk: Filnavn må være relative til basismapper!
 <source>Set as default</source>
 <target>Set som standard</target>
 
+<source>Operation aborted!</source>
+<target>Handling avbrutt!</target>
+
 <source>All folders are in sync!</source>
 <target>Alle mapper er synkroniserte!</target>
 
 <source>Comma separated list</source>
 <target>Komma-separert liste</target>
 
-<source>Legend</source>
-<target>Forklaring</target>
-
 <source>File list exported!</source>
 <target>Filliste eksportert!</target>
 
 <source>Searching for program updates...</source>
 <target></target>
 
-<source>
-<pluralform>1 directory</pluralform>
-<pluralform>%x directories</pluralform>
-</source>
-<target>
-<pluralform>1 mappe</pluralform>
-<pluralform>%x mapper</pluralform>
-</target>
-
-<source>
-<pluralform>1 file</pluralform>
-<pluralform>%x files</pluralform>
-</source>
-<target>
-<pluralform>1 fil</pluralform>
-<pluralform>%x filer</pluralform>
-</target>
-
-<source>
-<pluralform>%x of 1 row in view</pluralform>
-<pluralform>%x of %y rows in view</pluralform>
-</source>
-<target>
-<pluralform>%x av 1 rekke</pluralform>
-<pluralform>%x av %y rekker</pluralform>
-</target>
-
 <source>Ignore further errors</source>
 <target>Ignorer ytterligere feil</target>
 
@@ -1059,6 +1059,18 @@ Merk: Filnavn må være relative til basismapper!
 <source>Filter</source>
 <target>Filter</target>
 
+<source>
+<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+</source>
+<target></target>
+
+<source>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
+</source>
+<target></target>
+
 <source>Direct</source>
 <target>Direkte</target>
 
@@ -1086,33 +1098,21 @@ Merk: Filnavn må være relative til basismapper!
 <source>Make hidden warnings and dialogs visible again?</source>
 <target>Gjør skjylte advarsler og dialoger synlige igjen?</target>
 
-<source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
-</source>
-<target></target>
-
-<source>
-<pluralform>Do you really want to delete the following item?</pluralform>
-<pluralform>Do you really want to delete the following %x items?</pluralform>
-</source>
-<target></target>
-
 <source>Leave as unresolved conflict</source>
 <target>Etterlat som uløste konflikter</target>
 
-<source>Time stamp</source>
-<target></target>
-
-<source>Append a timestamp to each file name</source>
-<target>Legg til et tidsstempel til hvert filnavn</target>
-
 <source>Replace</source>
 <target>Erstatt</target>
 
 <source>Move files and replace if existing</source>
 <target>Flytt filer og erstatt hvis eksisterer</target>
 
+<source>Time stamp</source>
+<target></target>
+
+<source>Append a timestamp to each file name</source>
+<target>Legg til et tidsstempel til hvert filnavn</target>
+
 <source>Folder</source>
 <target>Mappe</target>
 
@@ -1125,6 +1125,9 @@ Merk: Filnavn må være relative til basismapper!
 <source>Files</source>
 <target>Filer</target>
 
+<source>Items</source>
+<target></target>
+
 <source>Percentage</source>
 <target>Prosent</target>
 
@@ -1152,9 +1155,6 @@ Merk: Filnavn må være relative til basismapper!
 <source>Cannot write modification time of %x.</source>
 <target>Kan ikke skrive endringstid til %x.</target>
 
-<source>Cannot find system function %x.</source>
-<target>Kan ikke finne systemfunksjonen %x.</target>
-
 <source>Cannot read security context of %x.</source>
 <target>Kan ikke lese sikkerhetskontekst til %x.</target>
 
@@ -1170,8 +1170,8 @@ Merk: Filnavn må være relative til basismapper!
 <source>Cannot create directory %x.</source>
 <target>Kan ikke opprette mappen %x.</target>
 
-<source>Cannot copy symbolic link %x to %y.</source>
-<target>Kan ikke kopiere symbolsk lenke %x til %y.</target>
+<source>Cannot create symbolic link %x.</source>
+<target></target>
 
 <source>Cannot copy file %x to %y.</source>
 <target>Kan ikke kopiere filen %x til %y.</target>
@@ -1194,9 +1194,6 @@ Merk: Filnavn må være relative til basismapper!
 <source>%x PB</source>
 <target>%x PB</target>
 
-<source>%x%</source>
-<target>%x%</target>
-
 <source>
 <pluralform>1 min</pluralform>
 <pluralform>%x min</pluralform>
@@ -1281,18 +1278,12 @@ Merk: Filnavn må være relative til basismapper!
 <source>Cannot find the following folders:</source>
 <target>Kan ikke finne følgende mapper:</target>
 
-<source>You can ignore this error to consider each folder as empty.</source>
-<target>Denne feilen kan ignoreres dersom mappen er tom.</target>
+<source>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source>
+<target></target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Mapper er avhengige av hverandre! Vær forsiktig når du setter opp synkroniseringsregler:</target>
 
-<source>Start comparison</source>
-<target>Start sammenligning</target>
-
-<source>Calculating sync directions...</source>
-<target></target>
-
 <source>Conflict detected:</source>
 <target>Konflikt oppdaget:</target>
 
@@ -1305,18 +1296,21 @@ Merk: Filnavn må være relative til basismapper!
 <source>Items differ in attributes only</source>
 <target>Elementer har kun forskjellige attributter</target>
 
-<source>Symbolic links %x have the same date but a different target.</source>
-<target>Symbolske lenker %x har den samme datoen, men forskjellige mål.</target>
+<source>Resolving symbolic link %x</source>
+<target></target>
 
 <source>Comparing content of files %x</source>
 <target>Sammenligner innhold til filer %x</target>
 
-<source>Comparing files by content failed.</source>
-<target>Sammenligning av filer etter innhold feilet.</target>
-
 <source>Generating file list...</source>
 <target>Lager filliste...</target>
 
+<source>Start comparison</source>
+<target>Start sammenligning</target>
+
+<source>Calculating sync directions...</source>
+<target></target>
+
 <source>Both sides are equal</source>
 <target>Begge sider er like</target>
 
@@ -1422,12 +1416,6 @@ 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>Synkroniserer mappepar:</target>