use translations from BRANCH

1 files changed, 26 insertions, 2 deletions

diff --git a/i18n/no/advancedfm.ts b/i18n/no/advancedfm.ts
index 9a692b9..e0b6f28 100644
--- a/i18n/no/advancedfm.ts
+++ b/i18n/no/advancedfm.ts
@@ -1,355 +1,379 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>Note</source>
         <translation>Merk</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Den katalogen eksisterer ikke</translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002-2003 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation>Advanced FileManager
 er opphavsrettslig beskyttet 2002-2003
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 og er GPL lisensiert</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Vis skjulte filer</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Bytt katalog</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Utfør</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Åpne som tekst</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Handlinger</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Lag katalog</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Lag symlenke</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Endre navn</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopier</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Kopier som</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Kopier samme katalog</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Flytt</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slett</translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation>Legg til Dokumenter</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Utfør kommando</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Fil info</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Sett rettigheter</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Rettigheter</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Beam fil</translation>
     </message>
     <message>
         <source>AdvancedFm</source>
         <translation>AvansertFm</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fil</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vis</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Utfør kommando med utskrift</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Velg alle</translation>
     </message>
     <message>
         <source>Switch to Local</source>
-        <translation>Bytt til lokal</translation>
+        <translation type="obsolete">Bytt til lokal</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
-        <translation>Bytt til ekstern</translation>
+        <translation type="obsolete">Bytt til ekstern</translation>
     </message>
     <message>
         <source>Bookmark Directory</source>
         <translation>Bokmerke katalog</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>Fjern denne katalogen fra bokmerker</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Størrelse</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation>Sikker på at du vil slette
 filene %1 ?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nei</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>Slette katalog?</translation>
     </message>
     <message>
         <source>Really copy
 %1 files?</source>
         <translation>Sikker på at du vil kopiere
 filene %1?</translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation>Filen eksisterer!</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
         <translation>%1 eksisterer. Ok for å overskrive?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
         <translation>Kunne ikke kopiere %1 til %2</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
         <translation>Eksisterer. Ok for å overskrive?</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation>Kunne ikke kopiere</translation>
     </message>
     <message>
         <source>to
 </source>
         <translation>til</translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished">Kopier</translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished">Som</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation>Eksisterer allerede.
 Er du sikker på at du vil slette?</translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation>Kunne ikke flyttes
 </translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>AvansertFm utskrift</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>AvansertFm Beam ut</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Ir sent.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Kunne ikke endre filnavn</translation>
     </message>
     <message>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>AdvancedFm :: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> kB free</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Yet Implemented</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Output</source>
         <translation>Utskrift</translation>
     </message>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Lagre utskrift til fil (bare navn)</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Sett fil rettigheter</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Sett fil rettighter for:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>eier</translation>
     </message>
     <message>
         <source>group</source>
         <translation>gruppe</translation>
     </message>
     <message>
         <source>others</source>
         <translation>andre</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Eier</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Gruppe</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lese</translation>
     </message>
     <message>
         <source>write</source>
         <translation>skrive</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>utføre</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>filePermissions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>