[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[vidalia-svn] r2059: (trunk/src/lang)



Author: xiando
Date: 2007-10-21 04:55:50 -0400 (Sun, 21 Oct 2007)
New Revision: 2059

Modified:
   trunk/src/lang/vidalia_nb.ts
Log:


Modified: trunk/src/lang/vidalia_nb.ts
===================================================================
--- trunk/src/lang/vidalia_nb.ts	2007-10-21 08:19:57 UTC (rev 2058)
+++ trunk/src/lang/vidalia_nb.ts	2007-10-21 08:55:50 UTC (rev 2059)
@@ -1,2431 +1,1896 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1">
-<context>
+<!DOCTYPE TS>
+<TS>
+  <context>
     <name>AboutDialog</name>
     <message>
-        <location filename="../gui/about/aboutdialog.ui" line="25"/>
-        <source>About Vidalia</source>
-        <translation>Om Vidalia </translation>
+      <source>About Vidalia</source>
+      <translation>Om Vidalia </translation>
     </message>
     <message>
-        <location filename="../gui/about/aboutdialog.ui" line="79"/>
-        <source>Vidalia</source>
-        <translation>Vidalia</translation>
+      <source>Vidalia</source>
+      <translation>Vidalia</translation>
     </message>
     <message>
-        <location filename="../gui/about/aboutdialog.ui" line="247"/>
-        <source>Tor</source>
-        <translation>Tor</translation>
+      <source>Tor</source>
+      <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../gui/about/aboutdialog.ui" line="163"/>
-        <source>Qt</source>
-        <translation>Qt</translation>
+      <source>Qt</source>
+      <translation>Qt</translation>
     </message>
     <message>
-        <location filename="../gui/about/aboutdialog.ui" line="178"/>
-        <source>Qt Version</source>
-        <translation>Qt Versjon </translation>
+      <source>Qt Version</source>
+      <translation>Qt Versjon </translation>
     </message>
     <message>
-        <location filename="../gui/about/aboutdialog.ui" line="263"/>
-        <source>Tor Version</source>
-        <translation>Tor Versjon</translation>
+      <source>Tor Version</source>
+      <translation>Tor Versjon</translation>
     </message>
     <message>
-        <location filename="../gui/about/aboutdialog.ui" line="94"/>
-        <source>Vidalia Version</source>
-        <translation>Vidalia Versjon</translation>
+      <source>Vidalia Version</source>
+      <translation>Vidalia Versjon</translation>
     </message>
     <message>
-        <location filename="../gui/about/aboutdialog.cpp" line="79"/>
-        <source>&lt;Not Running&gt;</source>
-        <translation>&lt;Kjører ikke&gt;</translation>
+      <source>&lt;Not Running></source>
+      <translation>&lt;Kjører ikke></translation>
     </message>
     <message>
-        <location filename="../gui/about/aboutdialog.cpp" line="75"/>
-        <source>&lt;Unavailable&gt;</source>
-        <translation>&lt;Utilgjengelig&gt;</translation>
+      <source>&lt;Unavailable></source>
+      <translation>&lt;Utilgjengelig></translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>AdvancedPage</name>
     <message>
-        <location filename="../gui/config/advancedpage.ui" line="33"/>
-        <source>Control Port</source>
-        <translation>Kontroll Port</translation>
+      <source>Control Port</source>
+      <translation>Kontroll Port</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.ui" line="245"/>
-        <source>Start Tor with the specified configuration file (torrc)</source>
-        <translation>Start Tor med den spesifiserte konfigurasjonsfilen (torrc)</translation>
+      <source>Start Tor with the specified configuration file (torrc)</source>
+      <translation>Start Tor med den spesifiserte konfigurasjonsfilen (torrc)</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.ui" line="264"/>
-        <source>Select path to Tor configuration file</source>
-        <translation>Filsti til Tor sin konfigurasjonsfil</translation>
+      <source>Select path to Tor configuration file</source>
+      <translation>Filsti til Tor sin konfigurasjonsfil</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.ui" line="323"/>
-        <source>Browse</source>
-        <translation>Bla</translation>
+      <source>Browse</source>
+      <translation>Bla</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.ui" line="342"/>
-        <source>Permissions</source>
-        <translation>Tillatelser</translation>
+      <source>Permissions</source>
+      <translation>Tillatelser</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.ui" line="365"/>
-        <source>Run as User:</source>
-        <translation>Kjør som Bruker:</translation>
+      <source>Run as User:</source>
+      <translation>Kjør som Bruker:</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.ui" line="378"/>
-        <source>Vidalia will run with this User&apos;s permissions</source>
-        <translation>Vidalia vil kjøre med denne brukerens tillatelser</translation>
+      <source>Vidalia will run with this User's permissions</source>
+      <translation>Vidalia vil kjøre med denne brukerens tillatelser</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.ui" line="398"/>
-        <source>Run as Group:</source>
-        <translation>Kjør under Gruppe:</translation>
+      <source>Run as Group:</source>
+      <translation>Kjør under Gruppe:</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.ui" line="405"/>
-        <source>Vidalia will run with this Group&apos;s permissions</source>
-        <translation>Vidalia vil kjøre med denne Gruppen&apos;s tillatelser</translation>
+      <source>Vidalia will run with this Group's permissions</source>
+      <translation>Vidalia vil kjøre med denne Gruppen's tillatelser</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.cpp" line="213"/>
-        <source>Select Tor Configuration File</source>
-        <translation>Velg Konfigurasjonsfil for Tor</translation>
+      <source>Select Tor Configuration File</source>
+      <translation>Velg Konfigurasjonsfil for Tor</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.cpp" line="226"/>
-        <source>File Not Found</source>
-        <translation>Finner Ikke Filen</translation>
+      <source>File Not Found</source>
+      <translation>Finner Ikke Filen</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.cpp" line="228"/>
-        <source>%1 does not exist. Would you like to create it?</source>
-        <translation>%1 finnes ikke. Vil du lage den?</translation>
+      <source>%1 does not exist. Would you like to create it?</source>
+      <translation>%1 finnes ikke. Vil du lage den?</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.cpp" line="239"/>
-        <source>Failed to Create File</source>
-        <translation>Klarte ikke Lage FIl</translation>
+      <source>Failed to Create File</source>
+      <translation>Klarte ikke Lage FIl</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.cpp" line="240"/>
-        <source>Unable to create %1 [%2]</source>
-        <translation>Kunne ikke opprette %1 [%2]</translation>
+      <source>Unable to create %1 [%2]</source>
+      <translation>Kunne ikke opprette %1 [%2]</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.ui" line="429"/>
-        <source>Service</source>
-        <translation>Tjeneste</translation>
+      <source>Service</source>
+      <translation>Tjeneste</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.ui" line="444"/>
-        <source>Enable this if you wish to run Tor as a Windows service</source>
-        <translation>Skru dette på om du vil kjøre Tor som en WIndows-tjeneste</translation>
+      <source>Enable this if you wish to run Tor as a Windows service</source>
+      <translation>Skru dette på om du vil kjøre Tor som en WIndows-tjeneste</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.ui" line="447"/>
-        <source>Run Tor in the background as a Windows service</source>
-        <translation>Kjør Tor i bakgrunnen som en Windows-tjeneste</translation>
+      <source>Run Tor in the background as a Windows service</source>
+      <translation>Kjør Tor i bakgrunnen som en Windows-tjeneste</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.cpp" line="276"/>
-        <source>Unable to remove Tor Service</source>
-        <translation>Kunne ikke fjerne Tor-tjenesten</translation>
+      <source>Unable to remove Tor Service</source>
+      <translation>Kunne ikke fjerne Tor-tjenesten</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.cpp" line="287"/>
-        <source>Unable to install Tor Service</source>
-        <translation>Kunne ikke installere Tor-tjenesten</translation>
+      <source>Unable to install Tor Service</source>
+      <translation>Kunne ikke installere Tor-tjenesten</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.cpp" line="288"/>
-        <source>Vidalia was unable to install the Tor service.</source>
-        <translation>Vidalia klarte ikke installere Tor-tjenesten</translation>
+      <source>Vidalia was unable to install the Tor service.</source>
+      <translation>Vidalia klarte ikke installere Tor-tjenesten</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.cpp" line="278"/>
-        <source>Vidalia was unable to remove the Tor service.
+      <source>Vidalia was unable to remove the Tor service.
 
 You may need to remove it manually.</source>
-        <translation>Vidalia klarte ikke installere Tor-tjenesten 
+      <translation>Vidalia klarte ikke installere Tor-tjenesten 
 
 Du må kanskje fjerne den manuellt.</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.ui" line="224"/>
-        <source>Tor Configuration File</source>
-        <translation>Tors Konfigurasjonsfil</translation>
+      <source>Tor Configuration File</source>
+      <translation>Tors Konfigurasjonsfil</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.cpp" line="112"/>
-        <source>&apos;%1&apos; is not a valid IP address.</source>
-        <translation>&apos;%1&apos; er ikke en gyldig IP adresse.</translation>
+      <source>'%1' is not a valid IP address.</source>
+      <translation>'%1' er ikke en gyldig IP adresse.</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.ui" line="162"/>
-        <source>:</source>
-        <translation>:</translation>
+      <source>:</source>
+      <translation>:</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.cpp" line="123"/>
-        <source>You selected &apos;Password&apos; authentication, but did not specify a password.</source>
-        <translation type="unfinished"></translation>
+      <source>You selected 'Password' authentication, but did not specify a password.</source>
+      <translation>Du valgte 'Passord' autorisering, men du spesifiserte ikke ett passord.</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.cpp" line="255"/>
-        <source>Select a Directory to Use for Tor Data</source>
-        <translation type="unfinished"></translation>
+      <source>Select a Directory to Use for Tor Data</source>
+      <translation>Velg mappen som brukes til Tor's data</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.ui" line="53"/>
-        <source>Authentication:</source>
-        <translation type="unfinished"></translation>
+      <source>Authentication:</source>
+      <translation>Autorisering:</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.ui" line="63"/>
-        <source>Address:</source>
-        <translation type="unfinished">Adresse:</translation>
+      <source>Address:</source>
+      <translation type="unfinished" >Adresse:</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.ui" line="96"/>
-        <source>Cookie</source>
-        <translation type="unfinished"></translation>
+      <source>Cookie</source>
+      <translation>Kake</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.ui" line="101"/>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
+      <source>Password</source>
+      <translation>Passord</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.ui" line="116"/>
-        <source>Randomly Generate</source>
-        <translation type="unfinished"></translation>
+      <source>Randomly Generate</source>
+      <translation>Generer Tilfeldig</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.ui" line="280"/>
-        <source>Tor Data Directory</source>
-        <translation type="unfinished"></translation>
+      <source>Tor Data Directory</source>
+      <translation>Tor Data Mappe</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.ui" line="301"/>
-        <source>Store Tor data in the following directory</source>
-        <translation type="unfinished"></translation>
+      <source>Store Tor data in the following directory</source>
+      <translation>Lagr Tor's data i følgende mappe</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.ui" line="320"/>
-        <source>Select the directory used to store Tor data</source>
-        <translation type="unfinished"></translation>
+      <source>Select the directory used to store Tor data</source>
+      <translation>Velg mappe for lagring av Tor's data</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.ui" line="91"/>
-        <source>None</source>
-        <translation type="unfinished"></translation>
+      <source>None</source>
+      <translation>Ingen</translation>
     </message>
     <message>
-        <location filename="../gui/config/advancedpage.cpp" line="45"/>
-        <source>Advanced</source>
-        <translation type="unfinished">Avansert</translation>
+      <source>Advanced</source>
+      <translation type="unfinished" >Avansert</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>AppearancePage</name>
     <message>
-        <location filename="../gui/config/appearancepage.ui" line="36"/>
-        <source>Language</source>
-        <translation>Språk</translation>
+      <source>Language</source>
+      <translation>Språk</translation>
     </message>
     <message>
-        <location filename="../gui/config/appearancepage.ui" line="57"/>
-        <source>Choose the language used in Vidalia</source>
-        <translation>Velg språket du vil Vidalia skal bruke</translation>
+      <source>Choose the language used in Vidalia</source>
+      <translation>Velg språket du vil Vidalia skal bruke</translation>
     </message>
     <message>
-        <location filename="../gui/config/appearancepage.ui" line="89"/>
-        <source>Changes to language will only take effect after restarting Vidalia!</source>
-        <translation>Endringer av valgt språk trer først i kraft etter du starter Vidalia på ny!</translation>
+      <source>Changes to language will only take effect after restarting Vidalia!</source>
+      <translation>Endringer av valgt språk trer først i kraft etter du starter Vidalia på ny!</translation>
     </message>
     <message>
-        <location filename="../gui/config/appearancepage.ui" line="105"/>
-        <source>Style</source>
-        <translation>Stil</translation>
+      <source>Style</source>
+      <translation>Stil</translation>
     </message>
     <message>
-        <location filename="../gui/config/appearancepage.ui" line="139"/>
-        <source>Choose Vidalia&apos;s interface style</source>
-        <translation>Velg stil for Vidalia&apos;s grensesnitt</translation>
+      <source>Choose Vidalia's interface style</source>
+      <translation>Velg stil for Vidalia's grensesnitt</translation>
     </message>
     <message>
-        <location filename="../gui/config/appearancepage.cpp" line="34"/>
-        <source>Appearance</source>
-        <translation type="unfinished">Utseende</translation>
+      <source>Appearance</source>
+      <translation type="unfinished" >Utseende</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>BandwidthGraph</name>
     <message>
-        <location filename="../gui/bwgraph/bwgraph.ui" line="21"/>
-        <source>Tor Bandwidth Usage</source>
-        <translation>Tors Båndbredde-Bruk</translation>
+      <source>Tor Bandwidth Usage</source>
+      <translation>Tors Båndbredde-Bruk</translation>
     </message>
     <message>
-        <location filename="../gui/bwgraph/bwgraph.ui" line="45"/>
-        <source>Show Settings</source>
-        <translation>Vis Innstillinger</translation>
+      <source>Show Settings</source>
+      <translation>Vis Innstillinger</translation>
     </message>
     <message>
-        <location filename="../gui/bwgraph/bwgraph.ui" line="68"/>
-        <source>Reset</source>
-        <translation>Nullstill</translation>
+      <source>Reset</source>
+      <translation>Nullstill</translation>
     </message>
     <message>
-        <location filename="../gui/bwgraph/bwgraph.ui" line="161"/>
-        <source>Receive Rate</source>
-        <translation>Inngående Hastighet</translation>
+      <source>Receive Rate</source>
+      <translation>Inngående Hastighet</translation>
     </message>
     <message>
-        <location filename="../gui/bwgraph/bwgraph.ui" line="185"/>
-        <source>Send Rate</source>
-        <translation>Utgående Hastighet</translation>
+      <source>Send Rate</source>
+      <translation>Utgående Hastighet</translation>
     </message>
     <message>
-        <location filename="../gui/bwgraph/bwgraph.ui" line="304"/>
-        <source>Changes the transparency of the Bandwidth Graph</source>
-        <translation>Endringer gjennomsiktigheten av Båndbredde-Grafen</translation>
+      <source>Changes the transparency of the Bandwidth Graph</source>
+      <translation>Endringer gjennomsiktigheten av Båndbredde-Grafen</translation>
     </message>
     <message>
-        <location filename="../gui/bwgraph/bwgraph.ui" line="463"/>
-        <source>Save</source>
-        <translation>Lagr</translation>
+      <source>Save</source>
+      <translation>Lagr</translation>
     </message>
     <message>
-        <location filename="../gui/bwgraph/bwgraph.ui" line="470"/>
-        <source>Cancel</source>
-        <translation>Avbryt</translation>
+      <source>Cancel</source>
+      <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../gui/bwgraph/bwgraph.cpp" line="170"/>
-        <source>Since:</source>
-        <translation>Siden:</translation>
+      <source>Since:</source>
+      <translation>Siden:</translation>
     </message>
     <message>
-        <location filename="../gui/bwgraph/bwgraph.ui" line="388"/>
-        <source>100</source>
-        <translation>100</translation>
+      <source>100</source>
+      <translation>100</translation>
     </message>
     <message>
-        <location filename="../gui/bwgraph/bwgraph.ui" line="403"/>
-        <source>% Opaque</source>
-        <translation>% Ugjennomsiktig</translation>
+      <source>% Opaque</source>
+      <translation>% Ugjennomsiktig</translation>
     </message>
     <message>
-        <location filename="../gui/bwgraph/bwgraph.cpp" line="236"/>
-        <source>Hide Settings</source>
-        <translation>Skjul Innstillinger</translation>
+      <source>Hide Settings</source>
+      <translation>Skjul Innstillinger</translation>
     </message>
     <message>
-        <location filename="../gui/bwgraph/bwgraph.ui" line="198"/>
-        <source>Always on Top</source>
-        <translation>Alltid Øverst</translation>
+      <source>Always on Top</source>
+      <translation>Alltid Øverst</translation>
     </message>
     <message>
-        <location filename="../gui/bwgraph/bwgraph.ui" line="254"/>
-        <source>Style</source>
-        <translation>Stil</translation>
+      <source>Style</source>
+      <translation>Stil</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>Circuit</name>
     <message>
-        <location filename="../control/circuit.cpp" line="109"/>
-        <source>New</source>
-        <translation>Ny</translation>
+      <source>New</source>
+      <translation>Ny</translation>
     </message>
     <message>
-        <location filename="../control/circuit.cpp" line="110"/>
-        <source>Open</source>
-        <translation>Åpen</translation>
+      <source>Open</source>
+      <translation>Åpen</translation>
     </message>
     <message>
-        <location filename="../control/circuit.cpp" line="111"/>
-        <source>Building</source>
-        <translation>Bygger</translation>
+      <source>Building</source>
+      <translation>Bygger</translation>
     </message>
     <message>
-        <location filename="../control/circuit.cpp" line="112"/>
-        <source>Failed</source>
-        <translation>Feilet</translation>
+      <source>Failed</source>
+      <translation>Feilet</translation>
     </message>
     <message>
-        <location filename="../control/circuit.cpp" line="113"/>
-        <source>Closed</source>
-        <translation>Lukket</translation>
+      <source>Closed</source>
+      <translation>Lukket</translation>
     </message>
     <message>
-        <location filename="../control/circuit.cpp" line="114"/>
-        <source>Unknown</source>
-        <translation>Ukjent</translation>
+      <source>Unknown</source>
+      <translation>Ukjent</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>CircuitItem</name>
     <message>
-        <location filename="../gui/network/circuititem.cpp" line="48"/>
-        <source>&lt;Path Empty&gt;</source>
-        <translation>&lt;Tom Sti&gt;</translation>
+      <source>&lt;Path Empty></source>
+      <translation>&lt;Tom Sti></translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>CircuitListWidget</name>
     <message>
-        <location filename="../gui/network/circuitlistwidget.cpp" line="47"/>
-        <source>Connection</source>
-        <translation>Forbindelse</translation>
+      <source>Connection</source>
+      <translation>Forbindelse</translation>
     </message>
     <message>
-        <location filename="../gui/network/circuitlistwidget.cpp" line="47"/>
-        <source>Status</source>
-        <translation>Status</translation>
+      <source>Status</source>
+      <translation>Status</translation>
     </message>
     <message>
-        <location filename="../gui/network/circuitlistwidget.cpp" line="56"/>
-        <source>Close Circuit</source>
-        <translation>Lukk Krets</translation>
+      <source>Close Circuit</source>
+      <translation>Lukk Krets</translation>
     </message>
     <message>
-        <location filename="../gui/network/circuitlistwidget.cpp" line="62"/>
-        <source>Close Stream</source>
-        <translation>Lukk Strøm</translation>
+      <source>Close Stream</source>
+      <translation>Lukk Strøm</translation>
     </message>
     <message>
-        <location filename="../gui/network/circuitlistwidget.cpp" line="55"/>
-        <source>Zoom to Circuit</source>
-        <translation>Zoom til Krets</translation>
+      <source>Zoom to Circuit</source>
+      <translation>Zoom til Krets</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>ConfigDialog</name>
     <message>
-        <location filename="../gui/config/configdialog.cpp" line="63"/>
-        <source>General</source>
-        <translation>Generell</translation>
+      <source>General</source>
+      <translation>Generell</translation>
     </message>
     <message>
-        <location filename="../gui/config/configdialog.cpp" line="71"/>
-        <source>Server</source>
-        <translation type="obsolete">Tjener</translation>
+      <source>Server</source>
+      <translation>Tjener</translation>
     </message>
     <message>
-        <location filename="../gui/config/configdialog.cpp" line="79"/>
-        <source>Advanced</source>
-        <translation>Avansert</translation>
+      <source>Advanced</source>
+      <translation>Avansert</translation>
     </message>
     <message>
-        <location filename="../gui/config/configdialog.cpp" line="98"/>
-        <source>Cancel</source>
-        <translation>Avbryt</translation>
+      <source>Cancel</source>
+      <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../gui/config/configdialog.cpp" line="75"/>
-        <source>Appearance</source>
-        <translation>Utseende</translation>
+      <source>Appearance</source>
+      <translation>Utseende</translation>
     </message>
     <message>
-        <location filename="../gui/config/configdialog.cpp" line="93"/>
-        <source>Save</source>
-        <translation>Lagr</translation>
+      <source>Save</source>
+      <translation>Lagr</translation>
     </message>
     <message>
-        <location filename="../gui/config/configdialog.cpp" line="89"/>
-        <source>Help</source>
-        <translation>Hjelp</translation>
+      <source>Help</source>
+      <translation>Hjelp</translation>
     </message>
     <message>
-        <location filename="../gui/config/configdialog.ui" line="24"/>
-        <source>Settings</source>
-        <translation>Innstillinger</translation>
+      <source>Settings</source>
+      <translation>Innstillinger</translation>
     </message>
     <message>
-        <location filename="../gui/config/configdialog.cpp" line="67"/>
-        <source>Network</source>
-        <translation type="unfinished"></translation>
+      <source>Network</source>
+      <translation>Nettverk</translation>
     </message>
     <message>
-        <location filename="../gui/config/configdialog.cpp" line="168"/>
-        <source>Error Saving Settings</source>
-        <translation type="unfinished"></translation>
+      <source>Error Saving Settings</source>
+      <translation>Feil ved lagring av innstillinger</translation>
     </message>
     <message>
-        <location filename="../gui/config/configdialog.cpp" line="170"/>
-        <source>Vidalia was unable to save your %1 settings.</source>
-        <translation type="unfinished"></translation>
+      <source>Vidalia was unable to save your %1 settings.</source>
+      <translation>Vidalia klarte ikke å lagre dine %1 innstillinger.</translation>
     </message>
     <message>
-        <location filename="../gui/config/configdialog.cpp" line="197"/>
-        <source>Error Applying Settings</source>
-        <translation type="unfinished"></translation>
+      <source>Error Applying Settings</source>
+      <translation>Feil Ved Bruk av Innstillinger</translation>
     </message>
     <message>
-        <location filename="../gui/config/configdialog.cpp" line="199"/>
-        <source>Vidalia was unable to apply your %1 settings to Tor.</source>
-        <translation type="unfinished"></translation>
+      <source>Vidalia was unable to apply your %1 settings to Tor.</source>
+      <translation>Vidalia kunne ikke aktivere dine %1 innstillinger for Tor.</translation>
     </message>
-    <message>
-        <location filename="../gui/config/configdialog.cpp" line="71"/>
-        <source>Relay</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>ControlConnection</name>
     <message>
-        <location filename="../control/controlconnection.cpp" line="388"/>
-        <source>Control socket is not connected.</source>
-        <translation>Kontroll-porten er ikke tilkoblet.</translation>
+      <source>Control socket is not connected.</source>
+      <translation>Kontroll-porten er ikke tilkoblet.</translation>
     </message>
     <message>
-        <location filename="../control/controlconnection.cpp" line="325"/>
-        <source>Control socket is not connected</source>
-        <translation>Kontroll-porten er ikke tilkoblet.</translation>
+      <source>Control socket is not connected</source>
+      <translation>Kontroll-porten er ikke tilkoblet.</translation>
     </message>
     <message>
-        <location filename="../control/controlconnection.cpp" line="139"/>
-        <source>Vidalia was unable to connect to Tor. (%1)</source>
-        <translation type="unfinished"></translation>
+      <source>Vidalia was unable to connect to Tor. (%1)</source>
+      <translation>Vidalia klarte ikke å forbinde seg med Tor. (%1)</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>ControlSocket</name>
     <message>
-        <location filename="../control/controlsocket.cpp" line="72"/>
-        <source>Error sending control command. [%1]</source>
-        <translation>Feil ved sending av kontroll-kommando. [%1]</translation>
+      <source>Error sending control command. [%1]</source>
+      <translation>Feil ved sending av kontroll-kommando. [%1]</translation>
     </message>
     <message>
-        <location filename="../control/controlsocket.cpp" line="109"/>
-        <source>Socket disconnected while attempting to read a line of data.</source>
-        <translation>Forbindelsen ble avbrutt under forsøk på å lese en linje med data.</translation>
+      <source>Socket disconnected while attempting to read a line of data.</source>
+      <translation>Forbindelsen ble avbrutt under forsøk på å lese en linje med data.</translation>
     </message>
     <message>
-        <location filename="../control/controlsocket.cpp" line="147"/>
-        <source>Invalid control reply. [%1]</source>
-        <translation>Ugyldig kontroll-svar: [%1]</translation>
+      <source>Invalid control reply. [%1]</source>
+      <translation>Ugyldig kontroll-svar: [%1]</translation>
     </message>
     <message>
-        <location filename="../control/controlsocket.cpp" line="62"/>
-        <source>Control socket is not connected.</source>
-        <translation>Kontroll-porten er ikke tilkoblet.</translation>
+      <source>Control socket is not connected.</source>
+      <translation>Kontroll-porten er ikke tilkoblet.</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>GeneralPage</name>
     <message>
-        <location filename="../gui/config/generalpage.ui" line="69"/>
-        <source>Path to Tor&apos;s executable</source>
-        <translation>Sti til Tor&apos;s kjørbare programfil</translation>
+      <source>Path to Tor's executable</source>
+      <translation>Sti til Tor's kjørbare programfil</translation>
     </message>
     <message>
-        <location filename="../gui/config/generalpage.ui" line="88"/>
-        <source>Select path to Tor executable</source>
-        <translation>Velg filsti til Tor&apos;s programfil</translation>
+      <source>Select path to Tor executable</source>
+      <translation>Velg filsti til Tor's programfil</translation>
     </message>
     <message>
-        <location filename="../gui/config/generalpage.ui" line="91"/>
-        <source>Browse</source>
-        <translation>Bla</translation>
+      <source>Browse</source>
+      <translation>Bla</translation>
     </message>
     <message>
-        <location filename="../gui/config/generalpage.ui" line="110"/>
-        <source>Startup Options</source>
-        <translation>Oppstartsvalg</translation>
+      <source>Startup Options</source>
+      <translation>Oppstartsvalg</translation>
     </message>
     <message>
-        <location filename="../gui/config/generalpage.ui" line="125"/>
-        <source>Select to start Vidalia on system boot</source>
-        <translation>Velg for å starte Vidalia ved systemoppstart</translation>
+      <source>Select to start Vidalia on system boot</source>
+      <translation>Velg for å starte Vidalia ved systemoppstart</translation>
     </message>
     <message>
-        <location filename="../gui/config/generalpage.ui" line="128"/>
-        <source>Run Vidalia on system startup</source>
-        <translation>Kjør Vidalia ved system-oppstart</translation>
+      <source>Run Vidalia on system startup</source>
+      <translation>Kjør Vidalia ved system-oppstart</translation>
     </message>
     <message>
-        <location filename="../gui/config/generalpage.ui" line="141"/>
-        <source>Set to start Tor when you launch Vidalia</source>
-        <translation>Skru på for å starte Tor når du starter Vidalia</translation>
+      <source>Set to start Tor when you launch Vidalia</source>
+      <translation>Skru på for å starte Tor når du starter Vidalia</translation>
     </message>
     <message>
-        <location filename="../gui/config/generalpage.ui" line="144"/>
-        <source>Start Tor when Vidalia starts</source>
-        <translation>Start Tor når Vidalia starter</translation>
+      <source>Start Tor when Vidalia starts</source>
+      <translation>Start Tor når Vidalia starter</translation>
     </message>
     <message>
-        <location filename="../gui/config/generalpage.cpp" line="72"/>
-        <source>Select Path to Tor</source>
-        <translation>Velg filsti til Tor</translation>
+      <source>Select Path to Tor</source>
+      <translation>Velg filsti til Tor</translation>
     </message>
     <message>
-        <location filename="../gui/config/generalpage.ui" line="42"/>
-        <source>Tor Executable</source>
-        <translation>Tor Programfilen</translation>
+      <source>Tor Executable</source>
+      <translation>Tor Programfilen</translation>
     </message>
     <message>
-        <location filename="../gui/config/generalpage.cpp" line="63"/>
-        <source>Executables (*.exe)</source>
-        <translation>Kjørbare (*.exe)</translation>
+      <source>Executables (*.exe)</source>
+      <translation>Kjørbare (*.exe)</translation>
     </message>
     <message>
-        <location filename="../gui/config/generalpage.cpp" line="32"/>
-        <source>General</source>
-        <translation type="unfinished">Generell</translation>
+      <source>General</source>
+      <translation type="unfinished" >Generell</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>GraphFrame</name>
     <message>
-        <location filename="../gui/bwgraph/graphframe.cpp" line="248"/>
-        <source>Recv: </source>
-        <translation>Mottat:</translation>
+      <source>Recv: </source>
+      <translation>Mottat:</translation>
     </message>
     <message>
-        <location filename="../gui/bwgraph/graphframe.cpp" line="257"/>
-        <source>Sent: </source>
-        <translation>Sendt:</translation>
+      <source>Sent: </source>
+      <translation>Sendt:</translation>
     </message>
     <message>
-        <location filename="../gui/bwgraph/graphframe.cpp" line="269"/>
-        <source>%1 KB</source>
-        <translation>%1 KB</translation>
+      <source>%1 KB</source>
+      <translation>%1 KB</translation>
     </message>
     <message>
-        <location filename="../gui/bwgraph/graphframe.cpp" line="272"/>
-        <source>%1 MB</source>
-        <translation>%1 MB</translation>
+      <source>%1 MB</source>
+      <translation>%1 MB</translation>
     </message>
     <message>
-        <location filename="../gui/bwgraph/graphframe.cpp" line="275"/>
-        <source>%1 GB</source>
-        <translation>%1 GB</translation>
+      <source>%1 GB</source>
+      <translation>%1 GB</translation>
     </message>
     <message>
-        <location filename="../gui/bwgraph/graphframe.cpp" line="296"/>
-        <source>%1 KB/s</source>
-        <translation>%1 KB/s</translation>
+      <source>%1 KB/s</source>
+      <translation>%1 KB/s</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>HelpBrowser</name>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="38"/>
-        <source>Vidalia Help</source>
-        <translation>Vidalia Hjelp</translation>
+      <source>Vidalia Help</source>
+      <translation>Vidalia Hjelp</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="184"/>
-        <source>Find Previous</source>
-        <translation>Finn Forrige</translation>
+      <source>Find Previous</source>
+      <translation>Finn Forrige</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="197"/>
-        <source>Find Next</source>
-        <translation>Finn Neste</translation>
+      <source>Find Next</source>
+      <translation>Finn Neste</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="231"/>
-        <source>Case sensitive</source>
-        <translation>Skill mellom store og små bokstaver</translation>
+      <source>Case sensitive</source>
+      <translation>Skill mellom store og små bokstaver</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="270"/>
-        <source>Contents</source>
-        <translation>Innhold</translation>
+      <source>Contents</source>
+      <translation>Innhold</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="315"/>
-        <source>Help Topics</source>
-        <translation>Hjelpe-emner</translation>
+      <source>Help Topics</source>
+      <translation>Hjelpe-emner</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="360"/>
-        <source>Search</source>
-        <translation>Søk</translation>
+      <source>Search</source>
+      <translation>Søk</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="415"/>
-        <source>Found Documents</source>
-        <translation>Dokumenter Funnet </translation>
+      <source>Found Documents</source>
+      <translation>Dokumenter Funnet </translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="494"/>
-        <source>Back</source>
-        <translation>Tilbake</translation>
+      <source>Back</source>
+      <translation>Tilbake</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="497"/>
-        <source>Move to previous page (Backspace)</source>
-        <translation>Gå til forrige side (Rettetast)</translation>
+      <source>Move to previous page (Backspace)</source>
+      <translation>Gå til forrige side (Rettetast)</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="505"/>
-        <source>Backspace</source>
-        <translation>Backspace</translation>
+      <source>Backspace</source>
+      <translation>Backspace</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="513"/>
-        <source>Forward</source>
-        <translation>Fremover</translation>
+      <source>Forward</source>
+      <translation>Fremover</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="516"/>
-        <source>Move to next page (Shift+Backspace)</source>
-        <translation>Gå til neste side (Shift+Backspace)</translation>
+      <source>Move to next page (Shift+Backspace)</source>
+      <translation>Gå til neste side (Shift+Backspace)</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="524"/>
-        <source>Shift+Backspace</source>
-        <translation>operasjon</translation>
+      <source>Shift+Backspace</source>
+      <translation>operasjon</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="532"/>
-        <source>Home</source>
-        <translation>Hjem</translation>
+      <source>Home</source>
+      <translation>Hjem</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="535"/>
-        <source>Move to the Home page (Ctrl+H)</source>
-        <translation>Flytt til Hjem-siden (Ctrl+H)</translation>
+      <source>Move to the Home page (Ctrl+H)</source>
+      <translation>Flytt til Hjem-siden (Ctrl+H)</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="543"/>
-        <source>Ctrl+H</source>
-        <translation>Ctrl+H</translation>
+      <source>Ctrl+H</source>
+      <translation>Ctrl+H</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="560"/>
-        <source>Find</source>
-        <translation>Finn</translation>
+      <source>Find</source>
+      <translation>Finn</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="563"/>
-        <source>Search for a word or phrase on current page (Ctrl+F)</source>
-        <translation>Søk etter ord eller streng på denne siden (Ctrl+F)</translation>
+      <source>Search for a word or phrase on current page (Ctrl+F)</source>
+      <translation>Søk etter ord eller streng på denne siden (Ctrl+F)</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="571"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
+      <source>Ctrl+F</source>
+      <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="579"/>
-        <source>Close</source>
-        <translation>Lukk</translation>
+      <source>Close</source>
+      <translation>Lukk</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="582"/>
-        <source>Close Vidalia Help</source>
-        <translation>Lukk Vidalia Hjelp</translation>
+      <source>Close Vidalia Help</source>
+      <translation>Lukk Vidalia Hjelp</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="590"/>
-        <source>Esc</source>
-        <translation>Esc</translation>
+      <source>Esc</source>
+      <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.cpp" line="133"/>
-        <source>Error Loading Help Contents: </source>
-        <translation>Feil ved henging av Hjelp-Innhold </translation>
+      <source>Error Loading Help Contents: </source>
+      <translation>Feil ved henging av Hjelp-Innhold </translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.cpp" line="388"/>
-        <source>Search reached end of document</source>
-        <translation>Søket nådde slutten av dokumentet</translation>
+      <source>Search reached end of document</source>
+      <translation>Søket nådde slutten av dokumentet</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.cpp" line="390"/>
-        <source>Search reached start of document</source>
-        <translation>Søket nådde begynnelsen av dokumentet</translation>
+      <source>Search reached start of document</source>
+      <translation>Søket nådde begynnelsen av dokumentet</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.cpp" line="392"/>
-        <source>Text not found in document</source>
-        <translation>Fant ikke teksten i dokumentet</translation>
+      <source>Text not found in document</source>
+      <translation>Fant ikke teksten i dokumentet</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="162"/>
-        <source>Find:</source>
-        <translation>Finn:</translation>
+      <source>Find:</source>
+      <translation>Finn:</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="241"/>
-        <source>Whole words only</source>
-        <translation>Kun hele ord</translation>
+      <source>Whole words only</source>
+      <translation>Kun hele ord</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="372"/>
-        <source>Searching for:</source>
-        <translation>Søker etter:</translation>
+      <source>Searching for:</source>
+      <translation>Søker etter:</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.cpp" line="145"/>
-        <source>Supplied XML file is not a valid Contents document.</source>
-        <translation>Den oppgitte XML-filen er ikke ett dokument med gyldig innhold.</translation>
+      <source>Supplied XML file is not a valid Contents document.</source>
+      <translation>Den oppgitte XML-filen er ikke ett dokument med gyldig innhold.</translation>
     </message>
     <message>
-        <location filename="../gui/help/browser/helpbrowser.cpp" line="437"/>
-        <source>Found %1 results</source>
-        <translation>Fant %1 resultater</translation>
+      <source>Found %1 results</source>
+      <translation>Fant %1 resultater</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>HelpTextBrowser</name>
     <message>
-        <location filename="../gui/help/browser/helptextbrowser.cpp" line="59"/>
-        <source>Error opening help file: </source>
-        <translation>Feil ved åpning av hjelpe-fil:</translation>
+      <source>Error opening help file: </source>
+      <translation>Feil ved åpning av hjelpe-fil:</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>LogEvent</name>
     <message>
-        <location filename="../control/logevent.cpp" line="68"/>
-        <source>Debug</source>
-        <translation>Avlus</translation>
+      <source>Debug</source>
+      <translation>Avlus</translation>
     </message>
     <message>
-        <location filename="../control/logevent.cpp" line="69"/>
-        <source>Info</source>
-        <translation>Info</translation>
+      <source>Info</source>
+      <translation>Info</translation>
     </message>
     <message>
-        <location filename="../control/logevent.cpp" line="70"/>
-        <source>Notice</source>
-        <translation>Merknad</translation>
+      <source>Notice</source>
+      <translation>Merknad</translation>
     </message>
     <message>
-        <location filename="../control/logevent.cpp" line="71"/>
-        <source>Warning</source>
-        <translation>Advarsel</translation>
+      <source>Warning</source>
+      <translation>Advarsel</translation>
     </message>
     <message>
-        <location filename="../control/logevent.cpp" line="72"/>
-        <source>Error</source>
-        <translation>Feil</translation>
+      <source>Error</source>
+      <translation>Feil</translation>
     </message>
     <message>
-        <location filename="../control/logevent.cpp" line="73"/>
-        <source>Unknown</source>
-        <translation>Ukjent</translation>
+      <source>Unknown</source>
+      <translation>Ukjent</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/mainwindow.ui" line="382"/>
-        <source>About</source>
-        <translation>Om</translation>
+      <source>About</source>
+      <translation>Om</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="395"/>
-        <source>Exit</source>
-        <translation>Avslutt</translation>
+      <source>Exit</source>
+      <translation>Avslutt</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="256"/>
-        <source>Bandwidth Graph</source>
-        <translation>Båndbredde Graf</translation>
+      <source>Bandwidth Graph</source>
+      <translation>Båndbredde Graf</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="269"/>
-        <source>Message Log</source>
-        <translation>Meldingslogg</translation>
+      <source>Message Log</source>
+      <translation>Meldingslogg</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="319"/>
-        <source>Help</source>
-        <translation>Hjelp</translation>
+      <source>Help</source>
+      <translation>Hjelp</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="350"/>
-        <source>Ctrl+T</source>
-        <translation>Ctrl+T</translation>
+      <source>Ctrl+T</source>
+      <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="351"/>
-        <source>Ctrl+B</source>
-        <translation>Ctrl+B</translation>
+      <source>Ctrl+B</source>
+      <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="352"/>
-        <source>Ctrl+L</source>
-        <translation>Ctrl+L</translation>
+      <source>Ctrl+L</source>
+      <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="354"/>
-        <source>Ctrl+?</source>
-        <translation>Ctrl+?</translation>
+      <source>Ctrl+?</source>
+      <translation>Ctrl+?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="367"/>
-        <source>File</source>
-        <translation>Fil</translation>
+      <source>File</source>
+      <translation>Fil</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="370"/>
-        <source>Tor</source>
-        <translation>Tor </translation>
+      <source>Tor</source>
+      <translation>Tor </translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="375"/>
-        <source>View</source>
-        <translation>Vis</translation>
+      <source>View</source>
+      <translation>Vis</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="384"/>
-        <source>Vidalia Help</source>
-        <translation>Vidalia Hjelp</translation>
+      <source>Vidalia Help</source>
+      <translation>Vidalia Hjelp</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="545"/>
-        <source>Error Starting Tor</source>
-        <translation>Feil ved oppstart av Tor</translation>
+      <source>Error Starting Tor</source>
+      <translation>Feil ved oppstart av Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="591"/>
-        <source>Error Connecting to Tor</source>
-        <translation>Feil ved tilknytning til Tor</translation>
+      <source>Error Connecting to Tor</source>
+      <translation>Feil ved tilknytning til Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="650"/>
-        <source>Error Stopping Tor</source>
-        <translation>Feil ved Stopping av Tor</translation>
+      <source>Error Stopping Tor</source>
+      <translation>Feil ved Stopping av Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="681"/>
-        <source>Tor Exited</source>
-        <translation>Tor Avsluttet</translation>
+      <source>Tor Exited</source>
+      <translation>Tor Avsluttet</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="651"/>
-        <source>Vidalia was unable to stop Tor.</source>
-        <translation>Vidalia klarte ikke å avslutte Tor</translation>
+      <source>Vidalia was unable to stop Tor.</source>
+      <translation>Vidalia klarte ikke å avslutte Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="436"/>
-        <source>Tor is running</source>
-        <translation>Tor kjører</translation>
+      <source>Tor is running</source>
+      <translation>Tor kjører</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="623"/>
-        <source>Server is Enabled</source>
-        <translation type="obsolete">Tjeneren er tilkoblet</translation>
+      <source>Server is Enabled</source>
+      <translation>Tjeneren er tilkoblet</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="353"/>
-        <source>Ctrl+N</source>
-        <translation>Ctrl+N</translation>
+      <source>Ctrl+N</source>
+      <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="628"/>
-        <source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
+      <source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
 
 Would you like to shutdown gracefully and give clients time to find a new server?</source>
-        <translation type="obsolete">Du kjører allered en Tor-tjener. Hvis du avslutter din tjener vil det bryte dine åpne forbindelser fra klienter. 
+      <translation>Du kjører allered en Tor-tjener. Hvis du avslutter din tjener vil det bryte dine åpne forbindelser fra klienter. 
 
 Vil du stenge ned gradvis og gi dine klienter tid til å finne en ny tjener?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="684"/>
-        <source>Vidalia detected that Tor exited unexpectedly.
+      <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
-        <translation>Vidalia oppdaget at Tor plutselig og uventet avsluttet.
+      <translation>Vidalia oppdaget at Tor plutselig og uventet avsluttet.
 
 Vennligst sjekk meldings-loggen for indikatorer på hva som skjedde med Tor før programmet avsluttet.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="548"/>
-        <source>Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified.</source>
-        <translation>Vidalia kunne ikke starte Tor. Sjekk innstillingene dine for å sikre at du har oppgitt Tor-programmets riktige navn og plassering.</translation>
+      <source>Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified.</source>
+      <translation>Vidalia kunne ikke starte Tor. Sjekk innstillingene dine for å sikre at du har oppgitt Tor-programmets riktige navn og plassering.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="270"/>
-        <source>Network Map</source>
-        <translation>Nettverkskart</translation>
+      <source>Network Map</source>
+      <translation>Nettverkskart</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="332"/>
-        <source>Settings</source>
-        <translation>Innstillinger</translation>
+      <source>Settings</source>
+      <translation>Innstillinger</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="951"/>
-        <source>New Identity</source>
-        <translation>Ny Identitet </translation>
+      <source>New Identity</source>
+      <translation>Ny Identitet </translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="355"/>
-        <source>Ctrl+I</source>
-        <translation>Ctrl+I</translation>
+      <source>Ctrl+I</source>
+      <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="954"/>
-        <source>All subsequent connections will appear to be different than your old connections.</source>
-        <translation>Alle dine forbindelser vil se annerledes ut enn dine nåværende forbindelser.</translation>
+      <source>All subsequent connections will appear to be different than your old connections.</source>
+      <translation>Alle dine forbindelser vil se annerledes ut enn dine nåværende forbindelser.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="982"/>
-        <source>Failed to Create New Identity</source>
-        <translation>Kunne ikke lage Ny Identitet</translation>
+      <source>Failed to Create New Identity</source>
+      <translation>Kunne ikke lage Ny Identitet</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="185"/>
-        <source>Start Tor</source>
-        <translation>Start Tor</translation>
+      <source>Start Tor</source>
+      <translation>Start Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="122"/>
-        <source>Tor is not running</source>
-        <translation>Tor kjører ikke</translation>
+      <source>Tor is not running</source>
+      <translation>Tor kjører ikke</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="429"/>
-        <source>Tor is shutting down</source>
-        <translation>Tor stenger ned</translation>
+      <source>Tor is shutting down</source>
+      <translation>Tor stenger ned</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="437"/>
-        <source>Stop Tor</source>
-        <translation>Stopp Tor</translation>
+      <source>Stop Tor</source>
+      <translation>Stopp Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="453"/>
-        <source>Tor is starting up</source>
-        <translation>Tor starter opp</translation>
+      <source>Tor is starting up</source>
+      <translation>Tor starter opp</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="38"/>
-        <source>Vidalia Control Panel</source>
-        <translation>Vidalias Kontrollpanel</translation>
+      <source>Vidalia Control Panel</source>
+      <translation>Vidalias Kontrollpanel</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="68"/>
-        <source>Tor Status</source>
-        <translation>Tor Status</translation>
+      <source>Tor Status</source>
+      <translation>Tor Status</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="170"/>
-        <source>Vidalia Shortcuts</source>
-        <translation>Vidalia Snareveier</translation>
+      <source>Vidalia Shortcuts</source>
+      <translation>Vidalia Snareveier</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="195"/>
-        <source>Setup Relaying</source>
-        <translation>Konfigurer Formidling</translation>
+      <source>Setup Relaying</source>
+      <translation>Konfigurer Formidling</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="198"/>
-        <source>Set up a Tor relay and help the network grow</source>
-        <translation>Kjør en Tor mellommann og hjelp nettverket vokse</translation>
+      <source>Set up a Tor relay and help the network grow</source>
+      <translation>Kjør en Tor mellommann og hjelp nettverket vokse</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="208"/>
-        <source>View the Network</source>
-        <translation>Vis Nettverket</translation>
+      <source>View the Network</source>
+      <translation>Vis Nettverket</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="211"/>
-        <source>View a map of the Tor network</source>
-        <translation>Vis kart over Tor-nettverket</translation>
+      <source>View a map of the Tor network</source>
+      <translation>Vis kart over Tor-nettverket</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="224"/>
-        <source>Use a New Identity</source>
-        <translation>Bruk Ny Identitet</translation>
+      <source>Use a New Identity</source>
+      <translation>Bruk Ny Identitet</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="227"/>
-        <source>Make subsequent connections appear new</source>
-        <translation>Gjør at pågående forbindelser ser ut som nye</translation>
+      <source>Make subsequent connections appear new</source>
+      <translation>Gjør at pågående forbindelser ser ut som nye</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="259"/>
-        <source>View Tor&apos;s bandwidth usage</source>
-        <translation>Vis Tors båndbreddebruk</translation>
+      <source>View Tor's bandwidth usage</source>
+      <translation>Vis Tors båndbreddebruk</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="272"/>
-        <source>View Tor&apos;s log message history</source>
-        <translation>Vis historikken for Tor sin meldingslogg</translation>
+      <source>View Tor's log message history</source>
+      <translation>Vis historikken for Tor sin meldingslogg</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="322"/>
-        <source>View help documentation</source>
-        <translation>Vis hjelpetekstene</translation>
+      <source>View help documentation</source>
+      <translation>Vis hjelpetekstene</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="335"/>
-        <source>Configure Tor and Vidalia</source>
-        <translation>Konfigurer Tor og Vidalia</translation>
+      <source>Configure Tor and Vidalia</source>
+      <translation>Konfigurer Tor og Vidalia</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="385"/>
-        <source>View version and license information</source>
-        <translation>Vis versjon og lisens informasjon</translation>
+      <source>View version and license information</source>
+      <translation>Vis versjon og lisens informasjon</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="398"/>
-        <source>Exit Vidalia</source>
-        <translation>Avslutt Vidalia</translation>
+      <source>Exit Vidalia</source>
+      <translation>Avslutt Vidalia</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="450"/>
-        <source>Show this window on startup</source>
-        <translation>Vis dette vinduet ved oppstart</translation>
+      <source>Show this window on startup</source>
+      <translation>Vis dette vinduet ved oppstart</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="469"/>
-        <source>Hide</source>
-        <translation>Skjul</translation>
+      <source>Hide</source>
+      <translation>Skjul</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="472"/>
-        <source>Hide this window</source>
-        <translation>Skjul dette vinduet</translation>
+      <source>Hide this window</source>
+      <translation>Skjul dette vinduet</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="277"/>
-        <source>Control Panel</source>
-        <translation>Kontrollpanel</translation>
+      <source>Control Panel</source>
+      <translation>Kontrollpanel</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="356"/>
-        <source>Ctrl+P</source>
-        <translation>Ctrl+P</translation>
+      <source>Ctrl+P</source>
+      <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="434"/>
-        <source>Stop Tor Now</source>
-        <translation>Stopp Tor nå</translation>
+      <source>Stop Tor Now</source>
+      <translation>Stopp Tor nå</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="457"/>
-        <source>Starting Tor</source>
-        <translation type="unfinished"></translation>
+      <source>Starting Tor</source>
+      <translation>Starter Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="756"/>
-        <source>Cookie Authentication Required</source>
-        <translation type="unfinished"></translation>
+      <source>Cookie Authentication Required</source>
+      <translation>Kake Autorisering Påkrevd</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="759"/>
-        <source>Tor requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one.</source>
-        <translation type="unfinished"></translation>
+      <source>Tor requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one.</source>
+      <translation type="unfinished" />
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="761"/>
-        <source>Would you like to browse for the file &apos;control_auth_cookie&apos; yourself?</source>
-        <translation type="unfinished"></translation>
+      <source>Would you like to browse for the file 'control_auth_cookie' yourself?</source>
+      <translation type="unfinished" />
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="768"/>
-        <source>Tor Data Directory</source>
-        <translation type="unfinished"></translation>
+      <source>Tor Data Directory</source>
+      <translation>Tor Data Mappe</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="770"/>
-        <source>Tor Control Cookie (control_auth_cookie)</source>
-        <translation type="unfinished"></translation>
+      <source>Tor Control Cookie (control_auth_cookie)</source>
+      <translation>Tor Control Kake (control_auth_cookie)</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="812"/>
-        <source>Error Registering for Events</source>
-        <translation type="unfinished"></translation>
+      <source>Error Registering for Events</source>
+      <translation type="unfinished" />
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="814"/>
-        <source>Vidalia was unable to register for Tor events. Many of Vidalia&apos;s features may be unavailable.</source>
-        <translation type="unfinished"></translation>
+      <source>Vidalia was unable to register for Tor events. Many of Vidalia's features may be unavailable.</source>
+      <translation type="unfinished" />
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="833"/>
-        <source>Password Authentication Required</source>
-        <translation type="unfinished"></translation>
+      <source>Password Authentication Required</source>
+      <translation>Passord Autorisering Påkrevet</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="846"/>
-        <source>Error Authenticating to Tor</source>
-        <translation type="unfinished"></translation>
+      <source>Error Authenticating to Tor</source>
+      <translation>Feil ved Autorisering til Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="848"/>
-        <source>Vidalia was unable to authenticate to Tor. (%1)</source>
-        <translation type="unfinished"></translation>
+      <source>Vidalia was unable to authenticate to Tor. (%1)</source>
+      <translation>Vidalia kunne ikke autorisere ovenfor Tor. (%1)</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="850"/>
-        <source>Please check your control port authentication settings.</source>
-        <translation type="unfinished"></translation>
+      <source>Please check your control port authentication settings.</source>
+      <translation>Vennligst sjekk innstillingene for autorisering mot kontrollporten</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="834"/>
-        <source>Please enter your control password (not the hash):</source>
-        <translation type="unfinished"></translation>
+      <source>Please enter your control password (not the hash):</source>
+      <translation>Vennligst skriv inn kontrollportpassordet ditt (klartekst, ikke hash):</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="427"/>
-        <source>Your Tor relay is shutting down.
-Click &apos;Stop Tor&apos; again to force Tor to stop now.</source>
-        <translation type="unfinished"></translation>
+      <source>Your Tor server is shutting down.
+Click 'Stop Tor' again to force Tor to stop now.</source>
+      <translation>Tor tjeneren er i ferd med å stenges ned. Trykk 'Stop Tor' igjen for å tvinge Tor til å stoppe umiddelbart.</translation>
     </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="623"/>
-        <source>Relaying is Enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="628"/>
-        <source>You are currently running a Tor relay. Terminating your relay will interrupt any open connections from clients.
-
-Would you like to shutdown gracefully and give clients time to find a new relay?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>MessageLog</name>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="24"/>
-        <source>Message Log</source>
-        <translation>Meldings Logg</translation>
+      <source>Message Log</source>
+      <translation>Meldings Logg</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="71"/>
-        <source>Time</source>
-        <translation>Tid</translation>
+      <source>Time</source>
+      <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="76"/>
-        <source>Type</source>
-        <translation>Type</translation>
+      <source>Type</source>
+      <translation>Type</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="81"/>
-        <source>Message</source>
-        <translation>Melding</translation>
+      <source>Message</source>
+      <translation>Melding</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="381"/>
-        <source>Browse</source>
-        <translation>Bla</translation>
+      <source>Browse</source>
+      <translation>Bla</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="165"/>
-        <source>Saves the current Message Log settings</source>
-        <translation>Lagr de nåværende innstillingene for Meldingloggen</translation>
+      <source>Saves the current Message Log settings</source>
+      <translation>Lagr de nåværende innstillingene for Meldingloggen</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="168"/>
-        <source>Save Settings</source>
-        <translation>Lagr Inntillinger</translation>
+      <source>Save Settings</source>
+      <translation>Lagr Inntillinger</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="184"/>
-        <source>Cancels changes made to settings</source>
-        <translation>Avbryter endring av innstillingene</translation>
+      <source>Cancels changes made to settings</source>
+      <translation>Avbryter endring av innstillingene</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="187"/>
-        <source>Cancel</source>
-        <translation>Avbryt</translation>
+      <source>Cancel</source>
+      <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="201"/>
-        <source>Message Filter</source>
-        <translation>Meldings FIlter</translation>
+      <source>Message Filter</source>
+      <translation>Meldings FIlter</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="222"/>
-        <source>Error</source>
-        <translation>Feil</translation>
+      <source>Error</source>
+      <translation>Feil</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="238"/>
-        <source>Warning</source>
-        <translation>Advarsel</translation>
+      <source>Warning</source>
+      <translation>Advarsel</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="254"/>
-        <source>Notice</source>
-        <translation>Merknad</translation>
+      <source>Notice</source>
+      <translation>Merknad</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="270"/>
-        <source>Info</source>
-        <translation>Info</translation>
+      <source>Info</source>
+      <translation>Info</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="286"/>
-        <source>Debug</source>
-        <translation>Avlus</translation>
+      <source>Debug</source>
+      <translation>Avlus</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="462"/>
-        <source>Message Filters...</source>
-        <translation>Meldingsfilter</translation>
+      <source>Message Filters...</source>
+      <translation>Meldingsfilter</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="465"/>
-        <source>Set message filters</source>
-        <translation>Skru på meldingsfiltrering</translation>
+      <source>Set message filters</source>
+      <translation>Skru på meldingsfiltrering</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="478"/>
-        <source>History Size...</source>
-        <translation>Historikk Størrelse...</translation>
+      <source>History Size...</source>
+      <translation>Historikk Størrelse...</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="481"/>
-        <source>Set maximum number of messages to display</source>
-        <translation>Set maksimum antall meldinger som vises</translation>
+      <source>Set maximum number of messages to display</source>
+      <translation>Set maksimum antall meldinger som vises</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="497"/>
-        <source>Clear</source>
-        <translation>Tøm</translation>
+      <source>Clear</source>
+      <translation>Tøm</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="500"/>
-        <source>Clear all messages from the Message Log (Ctrl+E)</source>
-        <translation>Tøm alle meldinger fra Meldingslogge (Ctrl+E)</translation>
+      <source>Clear all messages from the Message Log (Ctrl+E)</source>
+      <translation>Tøm alle meldinger fra Meldingslogge (Ctrl+E)</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="508"/>
-        <source>Ctrl+E</source>
-        <translation>Ctrl+E</translation>
+      <source>Ctrl+E</source>
+      <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="522"/>
-        <source>Copy</source>
-        <translation>Kopier</translation>
+      <source>Copy</source>
+      <translation>Kopier</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="525"/>
-        <source>Copy the selected messages to the clipboard (Ctrl+C)</source>
-        <translation>Kopier valgte meldinger til utklippstavlen (Ctrl+C)</translation>
+      <source>Copy the selected messages to the clipboard (Ctrl+C)</source>
+      <translation>Kopier valgte meldinger til utklippstavlen (Ctrl+C)</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="533"/>
-        <source>Ctrl+C</source>
-        <translation>Ctrl+C</translation>
+      <source>Ctrl+C</source>
+      <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="544"/>
-        <source>Select All</source>
-        <translation>Velg alt</translation>
+      <source>Select All</source>
+      <translation>Velg alt</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="547"/>
-        <source>Select all messages (Ctrl+A)</source>
-        <translation>Velg alle meldinger (Ctrl+A)</translation>
+      <source>Select all messages (Ctrl+A)</source>
+      <translation>Velg alle meldinger (Ctrl+A)</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="555"/>
-        <source>Ctrl+A</source>
-        <translation>Ctrl+A</translation>
+      <source>Ctrl+A</source>
+      <translation>Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="563"/>
-        <source>Save All</source>
-        <translation>Lagr Alt</translation>
+      <source>Save All</source>
+      <translation>Lagr Alt</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="566"/>
-        <source>Save all messages to a file</source>
-        <translation>Lagr alle meldinger til en fil</translation>
+      <source>Save all messages to a file</source>
+      <translation>Lagr alle meldinger til en fil</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="579"/>
-        <source>Save Selected</source>
-        <translation>Lagr merket</translation>
+      <source>Save Selected</source>
+      <translation>Lagr merket</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="582"/>
-        <source>Save selected messages to a file</source>
-        <translation>Lagr valgte meldinger i en fil</translation>
+      <source>Save selected messages to a file</source>
+      <translation>Lagr valgte meldinger i en fil</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="636"/>
-        <source>Close</source>
-        <translation>Lukk</translation>
+      <source>Close</source>
+      <translation>Lukk</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="639"/>
-        <source>Close the Message Log</source>
-        <translation>Lukk Meldingsloggen</translation>
+      <source>Close the Message Log</source>
+      <translation>Lukk Meldingsloggen</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="647"/>
-        <source>Esc</source>
-        <translation>Esc</translation>
+      <source>Esc</source>
+      <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="658"/>
-        <source>Find</source>
-        <translation>Finn </translation>
+      <source>Find</source>
+      <translation>Finn </translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="661"/>
-        <source>Find all messages containing the search text (Ctrl+F)</source>
-        <translation>Finn alle meldinger som inneholder søketeksten (Ctrl+F)</translation>
+      <source>Find all messages containing the search text (Ctrl+F)</source>
+      <translation>Finn alle meldinger som inneholder søketeksten (Ctrl+F)</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="669"/>
-        <source>Ctrl+F</source>
-        <translation>Ctrl+F</translation>
+      <source>Ctrl+F</source>
+      <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.cpp" line="148"/>
-        <source>Messages that appear when something has 
+      <source>Messages that appear when something has 
 gone very wrong and Tor cannot proceed.</source>
-        <translation>Meldinger som vises om noe har gått veldig galt og Tor ikke kan fortsette.</translation>
+      <translation>Meldinger som vises om noe har gått veldig galt og Tor ikke kan fortsette.</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.cpp" line="150"/>
-        <source>Messages that only appear when 
+      <source>Messages that only appear when 
 something has gone wrong with Tor.</source>
-        <translation>Meldinger som kun vises når noe har gått galt med Tor.</translation>
+      <translation>Meldinger som kun vises når noe har gått galt med Tor.</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.cpp" line="154"/>
-        <source>Messages that appear infrequently 
+      <source>Messages that appear infrequently 
 during normal Tor operation and are 
 not considered errors, but you may 
 care about.</source>
-        <translation>Meldinger som sjelden vises ved normal Tor-aktivitet og som ikke regnes som feil men likevel kan være av interesse.</translation>
+      <translation>Meldinger som sjelden vises ved normal Tor-aktivitet og som ikke regnes som feil men likevel kan være av interesse.</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.cpp" line="156"/>
-        <source>Messages that appear frequently 
+      <source>Messages that appear frequently 
 during normal Tor operation.</source>
-        <translation>Meldinger som stadig vises ved vanlig Tor-aktivitet.</translation>
+      <translation>Meldinger som stadig vises ved vanlig Tor-aktivitet.</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.cpp" line="158"/>
-        <source>Hyper-verbose messages primarily of 
+      <source>Hyper-verbose messages primarily of 
 interest to Tor developers.</source>
-        <translation>Ekstra-detaljerte meldinger er primært nyttig for Tor-utviklere.</translation>
+      <translation>Ekstra-detaljerte meldinger er primært nyttig for Tor-utviklere.</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.cpp" line="203"/>
-        <source>Error Setting Filter</source>
-        <translation>Feilet ved setting av Filter</translation>
+      <source>Error Setting Filter</source>
+      <translation>Feilet ved setting av Filter</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.cpp" line="219"/>
-        <source>Error Opening Log File</source>
-        <translation>Feil ved åpning av Logg-Fil</translation>
+      <source>Error Opening Log File</source>
+      <translation>Feil ved åpning av Logg-Fil</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.cpp" line="294"/>
-        <source>Select Log File</source>
-        <translation>Velg Logg-fil</translation>
+      <source>Select Log File</source>
+      <translation>Velg Logg-fil</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.cpp" line="311"/>
-        <source>Save Log Messages</source>
-        <translation>Lagr Logg-meldinger</translation>
+      <source>Save Log Messages</source>
+      <translation>Lagr Logg-meldinger</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.cpp" line="323"/>
-        <source>Vidalia</source>
-        <translation>Vidalia</translation>
+      <source>Vidalia</source>
+      <translation>Vidalia</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.cpp" line="374"/>
-        <source>Find in Message Log</source>
-        <translation>Fin i Meldingsloggen</translation>
+      <source>Find in Message Log</source>
+      <translation>Fin i Meldingsloggen</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.cpp" line="375"/>
-        <source>Find:</source>
-        <translation>Finn:</translation>
+      <source>Find:</source>
+      <translation>Finn:</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.cpp" line="381"/>
-        <source>Not Found</source>
-        <translation>Ikke Funnet</translation>
+      <source>Not Found</source>
+      <translation>Ikke Funnet</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.cpp" line="382"/>
-        <source>Search found 0 matches.</source>
-        <translation>Søket ga 0 resultater.</translation>
+      <source>Search found 0 matches.</source>
+      <translation>Søket ga 0 resultater.</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="598"/>
-        <source>Settings</source>
-        <translation>Innstillinger</translation>
+      <source>Settings</source>
+      <translation>Innstillinger</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="601"/>
-        <source>Adjust Message Log Settings</source>
-        <translation>Tilpass Innstillinger for Meldingloggen</translation>
+      <source>Adjust Message Log Settings</source>
+      <translation>Tilpass Innstillinger for Meldingloggen</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="609"/>
-        <source>Ctrl+T</source>
-        <translation>Ctrl+T</translation>
+      <source>Ctrl+T</source>
+      <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="617"/>
-        <source>Help</source>
-        <translation>Hjelp</translation>
+      <source>Help</source>
+      <translation>Hjelp</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="620"/>
-        <source>Show the help browser</source>
-        <translation>Vis hjelp-leseren</translation>
+      <source>Show the help browser</source>
+      <translation>Vis hjelp-leseren</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.cpp" line="204"/>
-        <source>Vidalia was unable to register for Tor&apos;s log events.</source>
-        <translation>Vidalia klarte ikke hente ut Tors logg-hendelser.</translation>
+      <source>Vidalia was unable to register for Tor's log events.</source>
+      <translation>Vidalia klarte ikke hente ut Tors logg-hendelser.</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.cpp" line="324"/>
-        <source>Cannot write file %1
+      <source>Cannot write file %1
 
 %2.</source>
-        <translation>Kunne ikke skrive fil %1
+      <translation>Kunne ikke skrive fil %1
 
 %2.</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.cpp" line="220"/>
-        <source>Vidalia was unable to open the specified log file.</source>
-        <translation>Vidalia kunne ikke å åpne spesifisert logg-fil.</translation>
+      <source>Vidalia was unable to open the specified log file.</source>
+      <translation>Vidalia kunne ikke å åpne spesifisert logg-fil.</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.cpp" line="314"/>
-        <source>Text Files (*.txt)</source>
-        <translation>Tekst Filer (*.txt)</translation>
+      <source>Text Files (*.txt)</source>
+      <translation>Tekst Filer (*.txt)</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="628"/>
-        <source>F1</source>
-        <translation>F1</translation>
+      <source>F1</source>
+      <translation>F1</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.cpp" line="241"/>
-        <source>Log Filename Required</source>
-        <translation>Logg-Filnavn Påkrevd</translation>
+      <source>Log Filename Required</source>
+      <translation>Logg-Filnavn Påkrevd</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.cpp" line="243"/>
-        <source>You must enter a filename to be able to save log messages to a file.</source>
-        <translation>Du må oppgi ett filnavn for å kunne lagre meldingsloggen til en fil.</translation>
+      <source>You must enter a filename to be able to save log messages to a file.</source>
+      <translation>Du må oppgi ett filnavn for å kunne lagre meldingsloggen til en fil.</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="302"/>
-        <source>Message Log History</source>
-        <translation>Meldingshistorikk</translation>
+      <source>Message Log History</source>
+      <translation>Meldingshistorikk</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="323"/>
-        <source>Number of messages to display in the message log window</source>
-        <translation>Antall meldinger som vises i meldingsvinduet</translation>
+      <source>Number of messages to display in the message log window</source>
+      <translation>Antall meldinger som vises i meldingsvinduet</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="347"/>
-        <source>messages</source>
-        <translation>meldinger</translation>
+      <source>messages</source>
+      <translation>meldinger</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="366"/>
-        <source>Always Save New Log Messages</source>
-        <translation>Lagr alltid nye Logg-meldinger</translation>
+      <source>Always Save New Log Messages</source>
+      <translation>Lagr alltid nye Logg-meldinger</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="404"/>
-        <source>Enable automatically saving all new log messages to a file</source>
-        <translation>Skru på automatisk lagring av alle nye logg-meldinger til en fil</translation>
+      <source>Enable automatically saving all new log messages to a file</source>
+      <translation>Skru på automatisk lagring av alle nye logg-meldinger til en fil</translation>
     </message>
     <message>
-        <location filename="../gui/log/messagelog.ui" line="407"/>
-        <source>Automatically save new log messages to a file</source>
-        <translation>Lagr automatisk nye logg-meldinger til en fil</translation>
+      <source>Automatically save new log messages to a file</source>
+      <translation>Lagr automatisk nye logg-meldinger til en fil</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>NetViewer</name>
     <message>
-        <location filename="../gui/network/netviewer.ui" line="253"/>
-        <source>Refresh</source>
-        <translation>Oppdater</translation>
+      <source>Refresh</source>
+      <translation>Oppdater</translation>
     </message>
     <message>
-        <location filename="../gui/network/netviewer.ui" line="275"/>
-        <source>Help</source>
-        <translation>Hjelp</translation>
+      <source>Help</source>
+      <translation>Hjelp</translation>
     </message>
     <message>
-        <location filename="../gui/network/netviewer.ui" line="297"/>
-        <source>Close</source>
-        <translation>Lukk</translation>
+      <source>Close</source>
+      <translation>Lukk</translation>
     </message>
     <message>
-        <location filename="../gui/network/netviewer.ui" line="319"/>
-        <source>Zoom In</source>
-        <translation>Zoom Inn</translation>
+      <source>Zoom In</source>
+      <translation>Zoom Inn</translation>
     </message>
     <message>
-        <location filename="../gui/network/netviewer.ui" line="341"/>
-        <source>Zoom Out</source>
-        <translation>Zoom Ut</translation>
+      <source>Zoom Out</source>
+      <translation>Zoom Ut</translation>
     </message>
     <message>
-        <location filename="../gui/network/netviewer.ui" line="259"/>
-        <source>Refresh the list of routers and connections</source>
-        <translation type="obsolete">Oppdater listen over routere og forbindelser</translation>
+      <source>Refresh the list of routers and connections</source>
+      <translation>Oppdater listen over routere og forbindelser</translation>
     </message>
     <message>
-        <location filename="../gui/network/netviewer.ui" line="281"/>
-        <source>Show the network map help</source>
-        <translation>Vis hjelpeteksten for nettverkskartet</translation>
+      <source>Show the network map help</source>
+      <translation>Vis hjelpeteksten for nettverkskartet</translation>
     </message>
     <message>
-        <location filename="../gui/network/netviewer.ui" line="303"/>
-        <source>Close the network map</source>
-        <translation>Lukk nettverks-kartet</translation>
+      <source>Close the network map</source>
+      <translation>Lukk nettverks-kartet</translation>
     </message>
     <message>
-        <location filename="../gui/network/netviewer.ui" line="325"/>
-        <source>Zoom in on the network map</source>
-        <translation>Zoom inn på nettverks-kartet</translation>
+      <source>Zoom in on the network map</source>
+      <translation>Zoom inn på nettverks-kartet</translation>
     </message>
     <message>
-        <location filename="../gui/network/netviewer.ui" line="347"/>
-        <source>Zoom out on the network map</source>
-        <translation>Zoom ut på nettverks-kartet</translation>
+      <source>Zoom out on the network map</source>
+      <translation>Zoom ut på nettverks-kartet</translation>
     </message>
     <message>
-        <location filename="../gui/network/netviewer.ui" line="363"/>
-        <source>Zoom To Fit</source>
-        <translation>Zoom til å passe</translation>
+      <source>Zoom To Fit</source>
+      <translation>Zoom til å passe</translation>
     </message>
     <message>
-        <location filename="../gui/network/netviewer.ui" line="369"/>
-        <source>Zooms to fit all currently displayed circuits</source>
-        <translation>Zoomer slik at det passer alle viste forbindelser</translation>
+      <source>Zooms to fit all currently displayed circuits</source>
+      <translation>Zoomer slik at det passer alle viste forbindelser</translation>
     </message>
     <message>
-        <location filename="../gui/network/netviewer.ui" line="267"/>
-        <source>Ctrl+R</source>
-        <translation>Ctrl+R</translation>
+      <source>Ctrl+R</source>
+      <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../gui/network/netviewer.ui" line="289"/>
-        <source>F1</source>
-        <translation>F1</translation>
+      <source>F1</source>
+      <translation>F1</translation>
     </message>
     <message>
-        <location filename="../gui/network/netviewer.ui" line="311"/>
-        <source>Esc</source>
-        <translation>Esc</translation>
+      <source>Esc</source>
+      <translation>Esc</translation>
     </message>
     <message>
-        <location filename="../gui/network/netviewer.ui" line="333"/>
-        <source>+</source>
-        <translation>+</translation>
+      <source>+</source>
+      <translation>+</translation>
     </message>
     <message>
-        <location filename="../gui/network/netviewer.ui" line="355"/>
-        <source>-</source>
-        <translation>-</translation>
+      <source>-</source>
+      <translation>-</translation>
     </message>
     <message>
-        <location filename="../gui/network/netviewer.ui" line="377"/>
-        <source>Ctrl+Z</source>
-        <translation>Ctrl+Z</translation>
+      <source>Ctrl+Z</source>
+      <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../gui/network/netviewer.ui" line="278"/>
-        <source>Show network map help</source>
-        <translation>Vis hjelpetekst for nettverks-kartet</translation>
+      <source>Show network map help</source>
+      <translation>Vis hjelpetekst for nettverks-kartet</translation>
     </message>
     <message>
-        <location filename="../gui/network/netviewer.ui" line="32"/>
-        <source>Tor Network Map</source>
-        <translation type="unfinished"></translation>
+      <source>Tor Network Map</source>
+      <translation>Tor Nettverkskart</translation>
     </message>
-    <message>
-        <location filename="../gui/network/netviewer.ui" line="259"/>
-        <source>Refresh the list of Tor relays and connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>NetworkPage</name>
     <message>
-        <location filename="../gui/config/networkpage.cpp" line="45"/>
-        <source>Network</source>
-        <translation type="unfinished"></translation>
+      <source>Network</source>
+      <translation>Nettverk</translation>
     </message>
     <message>
-        <location filename="../gui/config/networkpage.cpp" line="178"/>
-        <source>Invalid Bridge</source>
-        <translation type="unfinished"></translation>
+      <source>Invalid Bridge</source>
+      <translation>Ugyldig Bro</translation>
     </message>
     <message>
-        <location filename="../gui/config/networkpage.cpp" line="179"/>
-        <source>The specified bridge identifier is not valid.</source>
-        <translation type="unfinished"></translation>
+      <source>The specified bridge identifier is not valid.</source>
+      <translation>Den oppgitte bro-identifikatoren er ikke gyldig</translation>
     </message>
     <message>
-        <location filename="../gui/config/networkpage.cpp" line="226"/>
-        <source>Copy (Ctrl+C)</source>
-        <translation type="unfinished"></translation>
+      <source>Copy (Ctrl+C)</source>
+      <translation>Kopier (Ctrl+C)</translation>
     </message>
     <message>
-        <location filename="../gui/config/networkpage.cpp" line="255"/>
-        <source>You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.</source>
-        <translation type="unfinished"></translation>
+      <source>You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.</source>
+      <translation>
+</translation>
     </message>
     <message>
-        <location filename="../gui/config/networkpage.cpp" line="261"/>
-        <source>You must specify one or more ports to which your firewall allows you to connect.</source>
-        <translation type="unfinished"></translation>
+      <source>You must specify one or more ports to which your firewall allows you to connect.</source>
+      <translation>You must specify one or more ports to which your firewall allows you to connect.</translation>
     </message>
     <message>
-        <location filename="../gui/config/networkpage.cpp" line="297"/>
-        <source>&apos;%1&apos; is not a valid port number.</source>
-        <translation type="unfinished"></translation>
+      <source>'%1' is not a valid port number.</source>
+      <translation>'%1' er ikke ett gyldig portnummer.</translation>
     </message>
     <message>
-        <location filename="../gui/config/networkpage.ui" line="30"/>
-        <source>Check to configure Tor to use a proxy to access the Internet</source>
-        <translation type="unfinished"></translation>
+      <source>Check to configure Tor to use a proxy to access the Internet</source>
+      <translation>Velg for å konfigurere Tor til å bruke en proxy til å tilknytte Internett</translation>
     </message>
     <message>
-        <location filename="../gui/config/networkpage.ui" line="33"/>
-        <source>I use a proxy to access the Internet</source>
-        <translation type="unfinished"></translation>
+      <source>I use a proxy to access the Internet</source>
+      <translation>Jeg bruker en proxy for å tilknytte Internett</translation>
     </message>
     <message>
-        <location filename="../gui/config/networkpage.ui" line="63"/>
-        <source>Proxy Settings</source>
-        <translation type="unfinished"></translation>
+      <source>Proxy Settings</source>
+      <translation>Proxy Innstillinger</translation>
     </message>
     <message>
-        <location filename="../gui/config/networkpage.ui" line="75"/>
-        <source>HTTP Proxy:</source>
-        <translation type="unfinished"></translation>
+      <source>HTTP Proxy:</source>
+      <translation>HTTP-Proxy:</translation>
     </message>
     <message>
-        <location filename="../gui/config/networkpage.ui" line="85"/>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
+      <source>Username:</source>
+      <translation>Brukernavn:</translation>
     </message>
     <message>
-        <location filename="../gui/config/networkpage.ui" line="95"/>
-        <source>Use this proxy for HTTPS also</source>
-        <translation type="unfinished"></translation>
+      <source>Use this proxy for HTTPS also</source>
+      <translation>Bruk denne proxyen også for HTTPS</translation>
     </message>
     <message>
-        <location filename="../gui/config/networkpage.ui" line="113"/>
-        <source>Password:</source>
-        <translation type="unfinished"></translation>
+      <source>Password:</source>
+      <translation>Passord:</translation>
     </message>
     <message>
-        <location filename="../gui/config/networkpage.ui" line="140"/>
-        <source>Port:</source>
-        <translation type="unfinished"></translation>
+      <source>Port:</source>
+      <translation>Port:</translation>
     </message>
     <message>
-        <location filename="../gui/config/networkpage.ui" line="181"/>
-        <source>Check to configure Tor to only connect to servers using ports allowed by your firewall</source>
-        <translation type="unfinished"></translation>
+      <source>Check to configure Tor to only connect to servers using ports allowed by your firewall</source>
+      <translation type="unfinished" />
     </message>
     <message>
-        <location filename="../gui/config/networkpage.ui" line="184"/>
-        <source>My firewall only lets me connect to certain ports</source>
-        <translation type="unfinished"></translation>
+      <source>My firewall only lets me connect to certain ports</source>
+      <translation>Brannmuren min lar meg bare tilknytte visse porter</translation>
     </message>
     <message>
-        <location filename="../gui/config/networkpage.ui" line="208"/>
-        <source>Firewall Settings</source>
-        <translation type="unfinished"></translation>
+      <source>Firewall Settings</source>
+      <translation>Brannmur Innstillinger</translation>
     </message>
     <message>
-        <location filename="../gui/config/networkpage.ui" line="220"/>
-        <source>Allowed Ports:</source>
-        <translation type="unfinished"></translation>
+      <source>Allowed Ports:</source>
+      <translation>Tillatte Porter:</translation>
     </message>
     <message>
-        <location filename="../gui/config/networkpage.ui" line="230"/>
-        <source>80, 443</source>
-        <translation type="unfinished">80, 443</translation>
+      <source>80, 443</source>
+      <translation type="unfinished" >80, 443</translation>
     </message>
     <message>
-        <location filename="../gui/config/networkpage.ui" line="240"/>
-        <source>Check to configure Tor to use bridge servers to access the Tor network</source>
-        <translation type="unfinished"></translation>
+      <source>Check to configure Tor to use bridge servers to access the Tor network</source>
+      <translation type="unfinished" />
     </message>
     <message>
-        <location filename="../gui/config/networkpage.ui" line="243"/>
-        <source>My ISP blocks connections to the Tor network</source>
-        <translation type="unfinished"></translation>
+      <source>My ISP blocks connections to the Tor network</source>
+      <translation type="unfinished" />
     </message>
     <message>
-        <location filename="../gui/config/networkpage.ui" line="267"/>
-        <source>Tor Bridge Settings</source>
-        <translation type="unfinished"></translation>
+      <source>Tor Bridge Settings</source>
+      <translation type="unfinished" />
     </message>
     <message>
-        <location filename="../gui/config/networkpage.ui" line="279"/>
-        <source>The Tor version you are currently running does not support bridges. &lt;br&gt;Tor will still try to encrypt its directory connections.</source>
-        <translation type="unfinished"></translation>
+      <source>The Tor version you are currently running does not support bridges. &lt;br>Tor will still try to encrypt its directory connections.</source>
+      <translation type="unfinished" />
     </message>
     <message>
-        <location filename="../gui/config/networkpage.ui" line="300"/>
-        <source>Add a Bridge:</source>
-        <translation type="unfinished"></translation>
+      <source>Add a Bridge:</source>
+      <translation type="unfinished" />
     </message>
     <message>
-        <location filename="../gui/config/networkpage.ui" line="372"/>
-        <source>Remove the selected bridges from the list</source>
-        <translation type="unfinished"></translation>
+      <source>Remove the selected bridges from the list</source>
+      <translation type="unfinished" />
     </message>
     <message>
-        <location filename="../gui/config/networkpage.ui" line="394"/>
-        <source>Copy the selected bridges to the clipboard</source>
-        <translation type="unfinished"></translation>
+      <source>Copy the selected bridges to the clipboard</source>
+      <translation type="unfinished" />
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>Policy</name>
     <message>
-        <location filename="../config/policy.cpp" line="178"/>
-        <source>accept</source>
-        <translation>aksepter</translation>
+      <source>accept</source>
+      <translation>aksepter</translation>
     </message>
     <message>
-        <location filename="../config/policy.cpp" line="178"/>
-        <source>reject</source>
-        <translation>nekt</translation>
+      <source>reject</source>
+      <translation>nekt</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>RouterDescriptor</name>
     <message>
-        <location filename="../control/routerdescriptor.cpp" line="87"/>
-        <source>Online</source>
-        <translation>Tilkoblet</translation>
+      <source>Online</source>
+      <translation>Tilkoblet</translation>
     </message>
     <message>
-        <location filename="../control/routerdescriptor.cpp" line="89"/>
-        <source>Hibernating</source>
-        <translation>Sover</translation>
+      <source>Hibernating</source>
+      <translation>Sover</translation>
     </message>
     <message>
-        <location filename="../control/routerdescriptor.cpp" line="91"/>
-        <source>Offline</source>
-        <translation>Frakoblet</translation>
+      <source>Offline</source>
+      <translation>Frakoblet</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>RouterDescriptorView</name>
     <message>
-        <location filename="../gui/network/routerdescriptorview.cpp" line="114"/>
-        <source>IP Address:</source>
-        <translation>IP Adresse:</translation>
+      <source>IP Address:</source>
+      <translation>IP Adresse:</translation>
     </message>
     <message>
-        <location filename="../gui/network/routerdescriptorview.cpp" line="115"/>
-        <source>Platform:</source>
-        <translation>Plattform:</translation>
+      <source>Platform:</source>
+      <translation>Plattform:</translation>
     </message>
     <message>
-        <location filename="../gui/network/routerdescriptorview.cpp" line="119"/>
-        <source>Bandwidth:</source>
-        <translation>Båndbredde:</translation>
+      <source>Bandwidth:</source>
+      <translation>Båndbredde:</translation>
     </message>
     <message>
-        <location filename="../gui/network/routerdescriptorview.cpp" line="121"/>
-        <source>Uptime:</source>
-        <translation>Oppetid:</translation>
+      <source>Uptime:</source>
+      <translation>Oppetid:</translation>
     </message>
     <message>
-        <location filename="../gui/network/routerdescriptorview.cpp" line="127"/>
-        <source>Last Updated:</source>
-        <translation>Sist Oppdatert:</translation>
+      <source>Last Updated:</source>
+      <translation>Sist Oppdatert:</translation>
     </message>
     <message>
-        <location filename="../gui/network/routerdescriptorview.cpp" line="110"/>
-        <source>Location:</source>
-        <translation>Sted:</translation>
+      <source>Location:</source>
+      <translation>Sted:</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>RouterListItem</name>
     <message>
-        <location filename="../gui/network/routerlistitem.cpp" line="94"/>
-        <source>%1 KB/s</source>
-        <translation>%1 KB/s</translation>
+      <source>%1 KB/s</source>
+      <translation>%1 KB/s</translation>
     </message>
     <message>
-        <location filename="../gui/network/routerlistitem.cpp" line="78"/>
-        <source>Offline</source>
-        <translation>Frakoblet</translation>
+      <source>Offline</source>
+      <translation>Frakoblet</translation>
     </message>
     <message>
-        <location filename="../gui/network/routerlistitem.cpp" line="82"/>
-        <source>Hibernating</source>
-        <translation>Sover</translation>
+      <source>Hibernating</source>
+      <translation>Sover</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>RouterListWidget</name>
     <message>
-        <location filename="../gui/network/routerlistwidget.cpp" line="44"/>
-        <source>Server</source>
-        <translation type="obsolete">Tjener</translation>
+      <source>Server</source>
+      <translation>Tjener</translation>
     </message>
     <message>
-        <location filename="../gui/network/routerlistwidget.cpp" line="55"/>
-        <source>Zoom to Server</source>
-        <translation type="obsolete">Zoom til Tjener</translation>
+      <source>Zoom to Server</source>
+      <translation>Zoom til Tjener</translation>
     </message>
     <message>
-        <location filename="../gui/network/routerlistwidget.cpp" line="231"/>
-        <source>%1 servers online (%2 total)</source>
-        <translation type="obsolete">%1 aktive tjenere (%2 totalt)</translation>
+      <source>%1 servers online (%2 total)</source>
+      <translation>%1 aktive tjenere (%2 totalt)</translation>
     </message>
-    <message>
-        <location filename="../gui/network/routerlistwidget.cpp" line="44"/>
-        <source>Relay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/network/routerlistwidget.cpp" line="55"/>
-        <source>Zoom to Relay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/network/routerlistwidget.cpp" line="231"/>
-        <source>%1 relays online (%2 total)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>ServerPage</name>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="33"/>
-        <source>Check to run as a Tor network server</source>
-        <translation type="obsolete">Kryss av for å kjøre Tor som en tjener</translation>
+      <source>Check to run as a Tor network server</source>
+      <translation>Kryss av for å kjøre Tor som en tjener</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="37"/>
-        <source>Relay traffic for the Tor network</source>
-        <translation>Videresend trafikk for Tor-nettverket</translation>
+      <source>Relay traffic for the Tor network</source>
+      <translation>Videresend trafikk for Tor-nettverket</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="214"/>
-        <source>Directory Port:</source>
-        <translation>Katalog Port:</translation>
+      <source>Directory Port:</source>
+      <translation>Katalog Port:</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="244"/>
-        <source>Directory Port Number</source>
-        <translation>Katalog Port Nummer</translation>
+      <source>Directory Port Number</source>
+      <translation>Katalog Port Nummer</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="114"/>
-        <source>Nickname:</source>
-        <translation>Kallenavn:</translation>
+      <source>Nickname:</source>
+      <translation>Kallenavn:</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="273"/>
-        <source>Name of your server</source>
-        <translation>Navnet på tjeneren din</translation>
+      <source>Name of your server</source>
+      <translation>Navnet på tjeneren din</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="182"/>
-        <source>Contact Info:</source>
-        <translation>Kontakt Info:</translation>
+      <source>Contact Info:</source>
+      <translation>Kontakt Info:</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="131"/>
-        <source>Server Port:</source>
-        <translation type="obsolete">Tjener Port:</translation>
+      <source>Server Port:</source>
+      <translation>Tjener Port:</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="167"/>
-        <source>Port on which users and other servers can communicate with your server</source>
-        <translation type="obsolete">Porten som brukere og tjenere kan bruke til å kommunisere med din tjener</translation>
+      <source>Port on which users and other servers can communicate with your server</source>
+      <translation>Porten som brukere og tjenere kan bruke til å kommunisere med din tjener</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="285"/>
-        <source>Enable to mirror the server directory</source>
-        <translation type="obsolete">SKru på for å speile tjener-katalogen</translation>
+      <source>Enable to mirror the server directory</source>
+      <translation>Skru på for å speile tjener-katalogen</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="288"/>
-        <source>Mirror the Server Directory </source>
-        <translation type="obsolete">Spil Tjener-katalogen</translation>
+      <source>Mirror the Server Directory </source>
+      <translation>Spil Tjener-katalogen</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="710"/>
-        <source>Exit Policies</source>
-        <translation>Utgangs-Politikk</translation>
+      <source>Exit Policies</source>
+      <translation>Utgangs-Politikk</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="856"/>
-        <source>Show help topic on exit policies</source>
-        <translation>Vis hjelpeteksten for tillatte utgående forbindelser</translation>
+      <source>Show help topic on exit policies</source>
+      <translation>Vis hjelpeteksten for tillatte utgående forbindelser</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.cpp" line="124"/>
-        <source>You must specify at least a server nickname and port.</source>
-        <translation type="obsolete">Du må minimum oppgi tjenerens kallenavn og port</translation>
+      <source>You must specify at least a server nickname and port.</source>
+      <translation>Du må minimum oppgi tjenerens kallenavn og port</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="254"/>
-        <source>Email address at which you may be reached if there is a
+      <source>Email address at which you may be reached if there is a
 problem with your server. You might also include your PGP or GPG
 fingerprint.</source>
-        <translation type="obsolete">E-post adresse hvor det er mulig å få tak i deg hvis tjeneren din sliter. Du kan også inkludere ditt PGP eller GPG fingeravtrykk.</translation>
+      <translation>E-post adresse hvor det er mulig å få tak i deg hvis tjeneren din sliter. Du kan også inkludere ditt PGP eller GPG fingeravtrykk.</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="566"/>
-        <source>Long-term average bandwidth limit</source>
-        <translation>Gjennomsnittlig langvarig båndbredde-begensning</translation>
+      <source>Long-term average bandwidth limit</source>
+      <translation>Gjennomsnittlig langvarig båndbredde-begensning</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="537"/>
-        <source>Average Rate</source>
-        <translation>Gjennomsnittshastighet</translation>
+      <source>Average Rate</source>
+      <translation>Gjennomsnittshastighet</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="654"/>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
+      <source>KB/s</source>
+      <translation>KB/s</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="641"/>
-        <source>Peak bandwidth rate limit</source>
-        <translation>Begrensning for kortvarige bånbredde-topper</translation>
+      <source>Peak bandwidth rate limit</source>
+      <translation>Begrensning for kortvarige bånbredde-topper</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="612"/>
-        <source>Maximum Rate</source>
-        <translation>Maksimal Hastighet</translation>
+      <source>Maximum Rate</source>
+      <translation>Maksimal Hastighet</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="448"/>
-        <source>Show help topic on bandwidth rate limits</source>
-        <translation>Hvis hjelpeteksten for båndbredde-begrensning</translation>
+      <source>Show help topic on bandwidth rate limits</source>
+      <translation>Hvis hjelpeteksten for båndbredde-begrensning</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="73"/>
-        <source>Basic Settings</source>
-        <translation>Grunnleggende Innstillinger</translation>
+      <source>Basic Settings</source>
+      <translation>Grunnleggende Innstillinger</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="326"/>
-        <source>Bandwidth Limits</source>
-        <translation>Båndbredde Begrensinger</translation>
+      <source>Bandwidth Limits</source>
+      <translation>Båndbredde Begrensinger</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="361"/>
-        <source>For Internet connections with fast download speed but slow upload, please list your upload speed here.</source>
-        <translation>Vennligst oppgi din opplastningshastighet her hvis du har rask nedlastningshastighet med treg opplastningshastighet.</translation>
+      <source>For Internet connections with fast download speed but slow upload, please list your upload speed here.</source>
+      <translation>Vennligst oppgi din opplastningshastighet her hvis du har rask nedlastningshastighet med treg opplastningshastighet.</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="382"/>
-        <source>Select the entry that most closely resembles your Internet connection</source>
-        <translation>Velg det som best reflekterer Internett-forbindelsen din</translation>
+      <source>Select the entry that most closely resembles your Internet connection</source>
+      <translation>Velg det som best reflekterer Internett-forbindelsen din</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="392"/>
-        <source>Cable/DSL 256 Kbps</source>
-        <translation>Kabel/DSL 256 Kbps</translation>
+      <source>Cable/DSL 256 Kbps</source>
+      <translation>Kabel/DSL 256 Kbps</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="397"/>
-        <source>Cable/DSL 512 Kbps</source>
-        <translation>Kabel/DSL 512 Kbps</translation>
+      <source>Cable/DSL 512 Kbps</source>
+      <translation>Kabel/DSL 512 Kbps</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="402"/>
-        <source>Cable/DSL 768 Kbps</source>
-        <translation>Kabel/DSL 768 Kbps</translation>
+      <source>Cable/DSL 768 Kbps</source>
+      <translation>Kabel/DSL 768 Kbps</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="407"/>
-        <source>T1/Cable/DSL 1.5 Mbps</source>
-        <translation>T1/Kabel/DSL 1,5 Mbps</translation>
+      <source>T1/Cable/DSL 1.5 Mbps</source>
+      <translation>T1/Kabel/DSL 1,5 Mbps</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="412"/>
-        <source>&gt; 1.5 Mbps</source>
-        <translation>&gt; 1.5 Mbps</translation>
+      <source>> 1.5 Mbps</source>
+      <translation>> 1.5 Mbps</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="417"/>
-        <source>Custom</source>
-        <translation>Egendefinert</translation>
+      <source>Custom</source>
+      <translation>Egendefinert</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="748"/>
-        <source>Ports 6660 - 6669 and 6697</source>
-        <translation>Port 6660 - 6669 og 6697</translation>
+      <source>Ports 6660 - 6669 and 6697</source>
+      <translation>Port 6660 - 6669 og 6697</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="751"/>
-        <source>Internet Relay Chat (IRC)</source>
-        <translation>Internett Relay Chat (IRC)</translation>
+      <source>Internet Relay Chat (IRC)</source>
+      <translation>Internett Relay Chat (IRC)</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="761"/>
-        <source>Ports 110, 143, 993 and 995</source>
-        <translation>Port 110, 143, 993 og 995</translation>
+      <source>Ports 110, 143, 993 and 995</source>
+      <translation>Port 110, 143, 993 og 995</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="764"/>
-        <source>Retrieve Mail (POP, IMAP)</source>
-        <translation>Motta E-Post (POP, IMAP)</translation>
+      <source>Retrieve Mail (POP, IMAP)</source>
+      <translation>Motta E-Post (POP, IMAP)</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="774"/>
-        <source>Ports unspecified by other checkboxes</source>
-        <translation>Porter ikke angitt i andre avkryssningsbokser</translation>
+      <source>Ports unspecified by other checkboxes</source>
+      <translation>Porter ikke angitt i andre avkryssningsbokser</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="777"/>
-        <source>Misc Other Services</source>
-        <translation>Diverse Andre Tjenester</translation>
+      <source>Misc Other Services</source>
+      <translation>Diverse Andre Tjenester</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="787"/>
-        <source>Ports 706, 1863, 5050, 5190, 5222, 8300 and 8888</source>
-        <translation>Port 706, 1863, 5050, 5190, 5222, 8300 og 8888</translation>
+      <source>Ports 706, 1863, 5050, 5190, 5222, 8300 and 8888</source>
+      <translation>Port 706, 1863, 5050, 5190, 5222, 8300 og 8888</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="790"/>
-        <source>Instant Messaging (IM)</source>
-        <translation>Bruker-Til-Bruker meldinger (IM)</translation>
+      <source>Instant Messaging (IM)</source>
+      <translation>Bruker-Til-Bruker meldinger (IM)</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="800"/>
-        <source>Port 443</source>
-        <translation>Port 443</translation>
+      <source>Port 443</source>
+      <translation>Port 443</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="803"/>
-        <source>Secure Websites (SSL)</source>
-        <translation>Sikre Nettsider (SSL)</translation>
+      <source>Secure Websites (SSL)</source>
+      <translation>Sikre Nettsider (SSL)</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="813"/>
-        <source>Port 80</source>
-        <translation>Port 80</translation>
+      <source>Port 80</source>
+      <translation>Port 80</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="816"/>
-        <source>Websites</source>
-        <translation>Nettsider</translation>
+      <source>Websites</source>
+      <translation>Nettsider</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="929"/>
-        <source>What Internet resources should Tor users be able to access from your Tor relay?</source>
-        <translation>Hvilke Internett-ressursjer skal Tor-brukere få lov å benytte fra din Tor-tjener?</translation>
+      <source>What Internet resources should Tor users be able to access from your Tor relay?</source>
+      <translation>Hvilke Internett-ressursjer skal Tor-brukere få lov å benytte fra din Tor-tjener?</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.ui" line="683"/>
-        <source>Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s.</source>
-        <translation>Din maksimale båndbredde-grense må være større enn eller lik din gjennomsnittsgrense. Begge verdiene må være minst 20 KB/s.</translation>
+      <source>Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s.</source>
+      <translation>Din maksimale båndbredde-grense må være større enn eller lik din gjennomsnittsgrense. Begge verdiene må være minst 20 KB/s.</translation>
     </message>
     <message>
-        <location filename="../gui/config/serverpage.cpp" line="78"/>
-        <source>Server</source>
-        <translation type="unfinished">Tjener</translation>
+      <source>Server</source>
+      <translation type="unfinished" >Tjener</translation>
     </message>
-    <message>
-        <location filename="../gui/config/serverpage.cpp" line="136"/>
-        <source>Bridge Support Unavailable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.cpp" line="139"/>
-        <source>You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.cpp" line="141"/>
-        <source>Please upgrade your Tor software or configure Tor to act as a normal Tor relay.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.cpp" line="209"/>
-        <source>You must specify at least a relay nickname and port.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="30"/>
-        <source>Run Tor as a client only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="44"/>
-        <source>Help censored users reach the Tor network (Tor 0.2.0.3-alpha or newer)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="136"/>
-        <source>Relay Port:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="172"/>
-        <source>Port on which users and other servers can communicate with your relay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="259"/>
-        <source>Email address at which you may be reached if there is a
-problem with your relay. You might also include your PGP or GPG fingerprint.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="289"/>
-        <source>Enable to mirror the Tor relay directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="292"/>
-        <source>Mirror the Relay Directory </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>Stream</name>
     <message>
-        <location filename="../control/stream.cpp" line="129"/>
-        <source>New</source>
-        <translation>Ny</translation>
+      <source>New</source>
+      <translation>Ny</translation>
     </message>
     <message>
-        <location filename="../control/stream.cpp" line="131"/>
-        <source>Resolving</source>
-        <translation>Slår opp</translation>
+      <source>Resolving</source>
+      <translation>Slår opp</translation>
     </message>
     <message>
-        <location filename="../control/stream.cpp" line="132"/>
-        <source>Connecting</source>
-        <translation>Tilknytter</translation>
+      <source>Connecting</source>
+      <translation>Tilknytter</translation>
     </message>
     <message>
-        <location filename="../control/stream.cpp" line="133"/>
-        <source>Open</source>
-        <translation>Åpen</translation>
+      <source>Open</source>
+      <translation>Åpen</translation>
     </message>
     <message>
-        <location filename="../control/stream.cpp" line="134"/>
-        <source>Failed</source>
-        <translation>Feilet</translation>
+      <source>Failed</source>
+      <translation>Feilet</translation>
     </message>
     <message>
-        <location filename="../control/stream.cpp" line="135"/>
-        <source>Closed</source>
-        <translation>Lukket</translation>
+      <source>Closed</source>
+      <translation>Lukket</translation>
     </message>
     <message>
-        <location filename="../control/stream.cpp" line="138"/>
-        <source>Unknown</source>
-        <translation>Ukjent</translation>
+      <source>Unknown</source>
+      <translation>Ukjent</translation>
     </message>
     <message>
-        <location filename="../control/stream.cpp" line="136"/>
-        <source>Retrying</source>
-        <translation>Prøver igjen</translation>
+      <source>Retrying</source>
+      <translation>Prøver igjen</translation>
     </message>
     <message>
-        <location filename="../control/stream.cpp" line="137"/>
-        <source>Remapped</source>
-        <translation type="unfinished"></translation>
+      <source>Remapped</source>
+      <translation type="unfinished" />
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>TorProcess</name>
     <message>
-        <location filename="../control/torprocess.cpp" line="117"/>
-        <source>Process %1 failed to stop. [%2]</source>
-        <translation>Prosess %1 nektet å stoppe. [%2]</translation>
+      <source>Process %1 failed to stop. [%2]</source>
+      <translation>Prosess %1 nektet å stoppe. [%2]</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>TorService</name>
     <message>
-        <location filename="../control/torservice.cpp" line="155"/>
-        <source>The Tor service is not installed.</source>
-        <translation>Tor tjenesten er ikke installert</translation>
+      <source>The Tor service is not installed.</source>
+      <translation>Tor tjenesten er ikke installert</translation>
     </message>
     <message>
-        <location filename="../control/torservice.cpp" line="173"/>
-        <source>Unable to start the Tor service.</source>
-        <translation>Kunne ikke starte Tor-tjeneren.</translation>
+      <source>Unable to start the Tor service.</source>
+      <translation>Kunne ikke starte Tor-tjeneren.</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>VMessageBox</name>
     <message>
-        <location filename="../gui/common/vmessagebox.cpp" line="88"/>
-        <source>OK</source>
-        <translation>OK</translation>
+      <source>OK</source>
+      <translation>OK</translation>
     </message>
     <message>
-        <location filename="../gui/common/vmessagebox.cpp" line="89"/>
-        <source>Cancel</source>
-        <translation>Avbryt</translation>
+      <source>Cancel</source>
+      <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../gui/common/vmessagebox.cpp" line="90"/>
-        <source>Yes</source>
-        <translation>Ja</translation>
+      <source>Yes</source>
+      <translation>Ja</translation>
     </message>
     <message>
-        <location filename="../gui/common/vmessagebox.cpp" line="91"/>
-        <source>No</source>
-        <translation>Nei</translation>
+      <source>No</source>
+      <translation>Nei</translation>
     </message>
     <message>
-        <location filename="../gui/common/vmessagebox.cpp" line="92"/>
-        <source>Help</source>
-        <translation>Hjelp</translation>
+      <source>Help</source>
+      <translation>Hjelp</translation>
     </message>
     <message>
-        <location filename="../gui/common/vmessagebox.cpp" line="93"/>
-        <source>Retry</source>
-        <translation>Prøv igjen</translation>
+      <source>Retry</source>
+      <translation>Prøv igjen</translation>
     </message>
     <message>
-        <location filename="../gui/common/vmessagebox.cpp" line="94"/>
-        <source>Show Log</source>
-        <translation>Vis Logg</translation>
+      <source>Show Log</source>
+      <translation>Vis Logg</translation>
     </message>
     <message>
-        <location filename="../gui/common/vmessagebox.cpp" line="95"/>
-        <source>Show Settings</source>
-        <translation>Vis Innstillinger</translation>
+      <source>Show Settings</source>
+      <translation>Vis Innstillinger</translation>
     </message>
     <message>
-        <location filename="../gui/common/vmessagebox.cpp" line="96"/>
-        <source>Continue</source>
-        <translation>Fortsett</translation>
+      <source>Continue</source>
+      <translation>Fortsett</translation>
     </message>
     <message>
-        <location filename="../gui/common/vmessagebox.cpp" line="97"/>
-        <source>Quit</source>
-        <translation>Avslutt</translation>
+      <source>Quit</source>
+      <translation>Avslutt</translation>
     </message>
     <message>
-        <location filename="../gui/common/vmessagebox.cpp" line="98"/>
-        <source>Browse</source>
-        <translation type="unfinished">Bla</translation>
+      <source>Browse</source>
+      <translation type="unfinished" >Bla</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>Vidalia</name>
     <message>
-        <location filename="../vidalia.cpp" line="249"/>
-        <source>Invalid language code specified: </source>
-        <translation>Ugyldig språk-kode spesifisert: </translation>
+      <source>Invalid language code specified: </source>
+      <translation>Ugyldig språk-kode spesifisert: </translation>
     </message>
     <message>
-        <location filename="../vidalia.cpp" line="256"/>
-        <source>Invalid GUI style specified: </source>
-        <translation>Ugyldig GUI-stil spesifisert:</translation>
+      <source>Invalid GUI style specified: </source>
+      <translation>Ugyldig GUI-stil spesifisert:</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="99"/>
-        <source>Vidalia is already running</source>
-        <translation>Vidalia kjører allerede</translation>
+      <source>Vidalia is already running</source>
+      <translation>Vidalia kjører allerede</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="105"/>
-        <source>Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.
+      <source>Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.
 
 Would you like to continue starting Vidalia?</source>
-        <translation>Vidalia oppdaget en annen Vidalia-prosess og bør derfor ikke startes. Hvis dette er feil kan du likevel starte Vidalia. 
+      <translation>Vidalia oppdaget en annen Vidalia-prosess og bør derfor ikke startes. Hvis dette er feil kan du likevel starte Vidalia. 
 
 Vil du fortsette og starte Vidalia?</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="85"/>
-        <source>Invalid Argument</source>
-        <translation>Ugyldig Argument</translation>
+      <source>Invalid Argument</source>
+      <translation>Ugyldig Argument</translation>
     </message>
     <message>
-        <location filename="../vidalia.cpp" line="180"/>
-        <source>Displays this usage message and exits.</source>
-        <translation>Viser denne brukesmeldingen og avslutter.</translation>
+      <source>Displays this usage message and exits.</source>
+      <translation>Viser denne brukesmeldingen og avslutter.</translation>
     </message>
     <message>
-        <location filename="../vidalia.cpp" line="182"/>
-        <source>Resets ALL stored Vidalia settings.</source>
-        <translation>Tilbakestill ALLE *lagrede* innstillinger for Vidalia.</translation>
+      <source>Resets ALL stored Vidalia settings.</source>
+      <translation>Tilbakestill ALLE *lagrede* innstillinger for Vidalia.</translation>
     </message>
     <message>
-        <location filename="../vidalia.cpp" line="184"/>
-        <source>Sets the directory Vidalia uses for data files.</source>
-        <translation>Velger mappen Vidalia bruker for sine datafiler.</translation>
+      <source>Sets the directory Vidalia uses for data files.</source>
+      <translation>Velger mappen Vidalia bruker for sine datafiler.</translation>
     </message>
     <message>
-        <location filename="../vidalia.cpp" line="186"/>
-        <source>Sets the name and location of Vidalia&apos;s pidfile.</source>
-        <translation>Gir navn og plassering av Vidalia sin pid-fil.</translation>
+      <source>Sets the name and location of Vidalia's pidfile.</source>
+      <translation>Gir navn og plassering av Vidalia sin pid-fil.</translation>
     </message>
     <message>
-        <location filename="../vidalia.cpp" line="188"/>
-        <source>Sets the name and location of Vidalia&apos;s logfile.</source>
-        <translation>Gir navn og plassering av Vidalia sin loggfil.</translation>
+      <source>Sets the name and location of Vidalia's logfile.</source>
+      <translation>Gir navn og plassering av Vidalia sin loggfil.</translation>
     </message>
     <message>
-        <location filename="../vidalia.cpp" line="191"/>
-        <source>Sets the verbosity of Vidalia&apos;s logging.</source>
-        <translation>Velger mengden informasjon Vidalia logger.</translation>
+      <source>Sets the verbosity of Vidalia's logging.</source>
+      <translation>Velger mengden informasjon Vidalia logger.</translation>
     </message>
     <message>
-        <location filename="../vidalia.cpp" line="194"/>
-        <source>Sets Vidalia&apos;s interface style.</source>
-        <translation>Velger stil for Vidalia sitt brukergrensesnitt.</translation>
+      <source>Sets Vidalia's interface style.</source>
+      <translation>Velger stil for Vidalia sitt brukergrensesnitt.</translation>
     </message>
     <message>
-        <location filename="../vidalia.cpp" line="197"/>
-        <source>Sets Vidalia&apos;s language.</source>
-        <translation>Velger Vidalia sitt språk.</translation>
+      <source>Sets Vidalia's language.</source>
+      <translation>Velger Vidalia sitt språk.</translation>
     </message>
     <message>
-        <location filename="../vidalia.cpp" line="201"/>
-        <source>Vidalia Usage Information</source>
-        <translation>Vidalia Bruksinformasjon</translation>
+      <source>Vidalia Usage Information</source>
+      <translation>Vidalia Bruksinformasjon</translation>
     </message>
     <message>
-        <location filename="../vidalia.cpp" line="262"/>
-        <source>Invalid log level specified: </source>
-        <translation>Ugyldig loggnivå valgt: </translation>
+      <source>Invalid log level specified: </source>
+      <translation>Ugyldig loggnivå valgt: </translation>
     </message>
     <message>
-        <location filename="../vidalia.cpp" line="268"/>
-        <source>Unable to open log file &apos;%1&apos;: %2</source>
-        <translation>Kunne ikke åpne loggfil &apos;%1&apos;: %2</translation>
+      <source>Unable to open log file '%1': %2</source>
+      <translation>Kunne ikke åpne loggfil '%1': %2</translation>
     </message>
-</context>
+  </context>
 </TS>