From 82fd0b6cb6ce83f93c69b4b8199c643c0e665ba3 Mon Sep 17 00:00:00 2001
From: eshe <jessehakanen@gmail.com>
Date: Tue, 22 Jun 2010 15:16:04 +0100
Subject: [PATCH] Norwegian translation updated and made small change to
 connection manager.

---
 src/common/connectionmanager.cpp |    2 +-
 src/common/translations/nb_NO.qm |  Bin 8099 -> 8115 bytes
 src/common/translations/nb_NO.ts |   38 +++++++++++++++++++-------------------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/common/connectionmanager.cpp b/src/common/connectionmanager.cpp
index e8d9ad4..510a504 100644
--- a/src/common/connectionmanager.cpp
+++ b/src/common/connectionmanager.cpp
@@ -406,7 +406,7 @@ void ConnectionManager::scanResult(const QDBusMessage& rep)
         {
             if(status == ICD_SCAN_NEW)
             {
-                connections_->insert(i, connection);
+                connections_->replace(i, connection);
             }
 
             return;
diff --git a/src/common/translations/nb_NO.qm b/src/common/translations/nb_NO.qm
index c5e9ee48cb190e18374b9ef48a9eefa1054dbb3d..a7e81d37684026a2316960e4eb00ac39657adf38 100644
GIT binary patch
delta 1155
zcmaJ<e`u6-9Dcs<uig3nx_Ljg+ir8$G`1EdnI<KggH*PqtF0U|q-p0o*EZQ!5Rpee
z#F%B_>-46Qj#&zqRK6j^By8SnMr8lQB%>c7DLQ6mkwcw5^Ca34-52h8-_PfHzMtp&
zeBb`X?&5bNiDF>cK|pPVlDwZd4&}gSfOaob<qTkd0d@I2AZI(&<PcCe4E00|2wla@
zmwp6f%6FwP`MZP0>!_-D4G1f!n%@H$Db)0?rT*Cr+C3Qz2y9Jl1`^hn*u6`k;A`}a
zj&Yk&40&}99>s;f+Bh&S3~M`}2(kL`2=PM^Z=ukhEiT=lfyg51_=^^eho#?EodgPQ
zO5^Lv&;3d^s}}*jALPn~bwIF29$iYE(x5~uu94rT%xgS~1UwDO2DP7rUzEPxVIcn_
z<xqMJ4fQC8Ym<O3E7!(3VEP<2Sl|Z&52(ph8xsht$>S4%cu3v*CV9S184RV>)HWvK
zIjf%jeh(nMoWWqP<{PM_u1c#upQ6!EwN>eF0*r90cKQS67<x;)6{5r3sB=W*C1Rcx
zNB<-(;i-=<1iU$(otycdx5Vp@y-!<Pyq!;yJ-x@f?ZoHIt$f;uTuK`y)6RW7%;2ka
z=>Tnd*Xnua-s6R?)YlEp<?%}OjX&2D*XfCJ)}@oi(mI!R_Z!Q0{K0v;F(5j5F}}T-
zhr)4V@M(Sl`YGe`;23jx&{S*Ba)96L|86Gh3(SLi-e4}hW_p-L3m&&B6Ri8+wvN5?
z9P>G5UAbCJBWJ7|`({%&VlO|xlY^rf3|zM-!V~;L2I9QU-x&lHtb{Wt%@Q5XMX6P8
zL(F|fZkE0GU<sb*iaFnEAq6pXxW8(zh+r9N_|nW(f-c0#C_&uq^6XH=1}DdyWwxM+
zjV3nQ(d^DO8zno!y<T9k9i6z27H6ORs&iWkIZuQ<?xVg+VV7kQx^o+{YwnfY{i3h{
zb$2%J;D1S$=#c-uyZv@-;>zw{@|TM_PSo%_-2uy->gch+{D1YDrnv17Jbbq|_8+=@
zcSi6hS*&nx=O2-BG}QBit<F$kw{2zlYm9s%x*V%$O;Lob*kra?&rI4dB{FAAQAKpY
i|1l;LcWV7nXRN5Av<y#ipU!_$;YDSi+<l}tF8&4$%_Woo

delta 1150
zcmZ`%Yitx{6g~6WM`vaq%xv3jyT!)RP}cMZ0>%WbR-vRtL0g1qLvZPeOKU;eVERKg
z6^RcLs(u9)Bm!xxBn^lR2&6=7Er!NK^oK%hVj9F4DX9-Mq&BUd?e+(o=u9$a=H7Gf
zJ@<U$RCZUsRh0Aq)jfdrBGlA9#0jWJ&I7J8XzFFae+Jr$#ejPcwA4kQ@Eo*(IFLJn
z()J$!c^cLGhLFBy(0Ca&(N}={anvl?3mCmvc_7C64H@*mkwI$=ul4N!lD<!|f1e73
zzrfL(<7{&S7ri<MkK*UsEgblaWcc;~%0JT6$F2bCNh#69LVu}rW0C@jD&z~>eH0#%
ze_Q)GQ1FL5@f`WVbBbB}AQ1RksajeGgqA2bm$Oc7P)nk>$nRAbH=IHeo^|T;S~m$_
zsz>*Ssr-QY!O(gNdRslVItAoRskbILU`~-1DzE@Mtfl%|=zyZ7E=&W`Lhaqx$qO`Q
zF!zMkx0{Z5u4=>IAEZO=84T@o1^TO4x5!m{y^lgqxYiDRWplG#uHp9;Cbqk#a;Y$A
ziQ`gUa*gNlQ-6`x?x`<X3V7X~t{wc&i+ZhiFQ6yAtxu3WC+Xci@Ckh@&$*)9O&NC1
z$jM7Iewi*Gp-gW~&l`D<2f9k%ICwADGxg1*^~A^YWI5yVXU6h6hjI@a)$jbtd79BL
zwenyBotc-yUyQ*u`~&m>V{CAozEqgn>Z=@Jn%&=)GQQC4Iru7l*=Y`4qR@g$UsaNE
z>m}dEosIP8wC~s7iz(!?Z}LzD>%Q@?xZcIVb2DgP^G}DT`G@o;c$(K}1XQeoSmw9I
zcXCkKiibrY5EUWiA@O0ra5gFpiZvfkA%SKz;U{b(Ca_72y5~A$t~SYAij|0C6GIOe
zVP}`8LzQB}ZO(J2d97%3?l&7`vjC6cS@K@M7PN>Se~0+dZHW!Jy7Ne&N;1o`(p|xI
z*%4<lcvuSOqYiECvW?HX(0E6`GuDFH>=tb0ot^#LDwirmiD8LDwokvaE)vQYo9*KN
z$)2_E%Vfe_gSyk5<JrBPNa(gAwK$>hahVG0XKad5SreJ*s<ds*Vz}^4)5uyeR`ik7
zEbPd7R@J6Gnc1v~&sp0L7oCx4-lG4`iVpXDF%?-*QidmICuMwz)19pCotol=^e<1x
BAYuRj

diff --git a/src/common/translations/nb_NO.ts b/src/common/translations/nb_NO.ts
index d1054e0..7541902 100644
--- a/src/common/translations/nb_NO.ts
+++ b/src/common/translations/nb_NO.ts
@@ -29,7 +29,7 @@
     </message>
     <message>
         <source>Automatic connecting is not allowed by settings.</source>
-        <translation>Automatisk oppkobling ikke tillatt, sjekk innstillinger.</translation>
+        <translation>Automatisk oppkobling ikke tillatt, sjekk innstillingene.</translation>
     </message>
     <message>
         <source>Connecting...</source>
@@ -68,7 +68,7 @@
     <message>
         <location filename="../../gui/connectionselector.cpp" line="72"/>
         <source>Any connection</source>
-        <translation>Vilkårlig tilkobling</translation>
+        <translation>Alle tilkoblinger</translation>
     </message>
 </context>
 <context>
@@ -77,7 +77,7 @@
         <location filename="../../gui/detailwindow.cpp" line="42"/>
         <location filename="../../gui/detailwindow.cpp" line="119"/>
         <source>Add to contacts</source>
-        <translation>Legg til kontakter</translation>
+        <translation>Legg til i kontakter</translation>
     </message>
     <message>
         <location filename="../../gui/detailwindow.cpp" line="43"/>
@@ -158,7 +158,7 @@
     <message>
         <location filename="../../gui/emptyguiconfig.cpp" line="27"/>
         <source>Selected phonebook has no settings to configure.</source>
-        <translation>Den valgte telefonlisten har ingen innstillinger.</translation>
+        <translation>Den valgte telefonkatalogen har ingen innstillinger.</translation>
     </message>
 </context>
 <context>
@@ -205,13 +205,13 @@
         <location filename="../../gui/mainwindow.cpp" line="54"/>
         <location filename="../../gui/mainwindow.cpp" line="151"/>
         <source>Stop daemon</source>
-        <translation>Stopp daemon</translation>
+        <translation>Stopp Autosøk</translation>
     </message>
     <message>
         <location filename="../../gui/mainwindow.cpp" line="60"/>
         <location filename="../../gui/mainwindow.cpp" line="117"/>
         <source>Start daemon</source>
-        <translation>Start daemon</translation>
+        <translation>Start Autosøk</translation>
     </message>
     <message>
         <location filename="../../gui/mainwindow.cpp" line="65"/>
@@ -231,22 +231,22 @@
     <message>
         <location filename="../../gui/mainwindow.cpp" line="115"/>
         <source>Daemon was successfully stopped.</source>
-        <translation>Daemon ble stoppet.</translation>
+        <translation>Autosøk ble stoppet.</translation>
     </message>
     <message>
         <location filename="../../gui/mainwindow.cpp" line="116"/>
         <source>Unable to stop daemon.</source>
-        <translation>Kan ikke stoppe daemon.</translation>
+        <translation>Kan ikke stoppe Autosøk.</translation>
     </message>
     <message>
         <location filename="../../gui/mainwindow.cpp" line="127"/>
         <source>Unable to start daemon</source>
-        <translation>Kan ikke starte daemon.</translation>
+        <translation>Kan ikke starte Autosøk.</translation>
     </message>
     <message>
         <location filename="../../gui/mainwindow.cpp" line="129"/>
         <source>Daemon cannot be started because it&apos;s not allowed to connect to the Internet. You have to either allow automatic Internet connection in Jenirok settings or in global Maemo settings.</source>
-        <translation>Daemon får ikke tilgang til internett. Du må enten tillate automatisk tilkobling til internett i Jenirok eller i globale Maemo innstillinger.</translation>
+        <translation>Autosøk får ikke tilgang til internett. Du må enten tillate automatisk oppkobling til internett i Jenirok eller i globale Maemo innstillinger.</translation>
     </message>
     <message>
         <location filename="../../gui/mainwindow.cpp" line="133"/>
@@ -261,12 +261,12 @@
     <message>
         <location filename="../../gui/mainwindow.cpp" line="149"/>
         <source>Daemon was successfully started.</source>
-        <translation>Daemon ble startet.</translation>
+        <translation>Autosøk ble startet.</translation>
     </message>
     <message>
         <location filename="../../gui/mainwindow.cpp" line="150"/>
         <source>Unable to start daemon.</source>
-        <translation>Kan ikke starte daemon.</translation>
+        <translation>Kan ikke starte autosøk.</translation>
     </message>
     <message>
         <location filename="../../gui/mainwindow.cpp" line="157"/>
@@ -333,7 +333,7 @@
     <message>
         <location filename="../../gui/searchdialog.cpp" line="33"/>
         <source>Name/number</source>
-        <translation>Navn/nummer</translation>
+        <translation>Navn/Nummer</translation>
     </message>
     <message>
         <location filename="../../gui/searchdialog.cpp" line="39"/>
@@ -379,7 +379,7 @@
     <message>
         <location filename="../../gui/settingsdialog.cpp" line="61"/>
         <source>Clear</source>
-        <translation>Tilbakestill</translation>
+        <translation>Tøm</translation>
     </message>
     <message>
         <location filename="../../gui/settingsdialog.cpp" line="64"/>
@@ -394,7 +394,7 @@
     <message>
         <location filename="../../gui/settingsdialog.cpp" line="82"/>
         <source>Phonebook</source>
-        <translation>Kontaktliste</translation>
+        <translation>Telefonkatalog</translation>
     </message>
     <message>
         <location filename="../../gui/settingsdialog.cpp" line="102"/>
@@ -424,23 +424,23 @@
     <message>
         <location filename="../../gui/settingsdialog.cpp" line="137"/>
         <source>General</source>
-        <translation>Generell</translation>
+        <translation>Generelt</translation>
     </message>
     <message>
         <location filename="../../gui/settingsdialog.cpp" line="138"/>
         <source>Daemon</source>
-        <translation>Daemon</translation>
+        <translation>Autosøk</translation>
     </message>
     <message>
         <location filename="../../gui/settingsdialog.cpp" line="139"/>
         <location filename="../../gui/settingsdialog.cpp" line="208"/>
         <source>Phonebook settings</source>
-        <translation>Kontaktliste innstillinger</translation>
+        <translation>Telefonkatalog innstillinger</translation>
     </message>
     <message>
         <location filename="../../gui/settingsdialog.cpp" line="170"/>
         <source>Restarting daemon...</source>
-        <translation>Restarter daemon...</translation>
+        <translation>Restarter Autosøk...</translation>
     </message>
     <message>
         <location filename="../../gui/settingsdialog.cpp" line="176"/>
-- 
1.7.9.5