Merge from BRANCH_1_0.

1 files changed, 77 insertions, 3 deletions

diff --git a/i18n/nl/libopieobex.ts b/i18n/nl/libopieobex.ts
index 501d230..3891a96 100644
--- a/i18n/nl/libopieobex.ts
+++ b/i18n/nl/libopieobex.ts
@@ -1,76 +1,150 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OtherHandler</name>
+    <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;Ontvangen:&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>Accepteer</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Weiger</translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation>&lt;p&gt;U heeft een file van het type %1 (&lt;img src=&quot;%2&quot;&gt; ontvangen. Wat wilt u ermee doen?</translation>
     </message>
 </context>
 <context>
-    <name>SendWidget</name>
+    <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;h1&gt;Verzenden:&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
         <translation>Klaar</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
         <translation>IrDa staat niet aan!</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
         <translation>Zoek naar IrDa apparaten.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
         <translation>Bluetooth is niet beschikbaar</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
         <translation>Zoek naar bluetooth apparaten.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
         <translation>Plan IrDa verzending.</translation>
     </message>
     <message>
         <source>Click to beam</source>
-        <translation>Klick voor IrDa verzending</translation>
+        <translation>Klik voor IrDa verzending</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Verzonden</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Mislukt</translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation>Poging %1</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
         <translation>Zoek nogmaals naar IrDa.</translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation>Start verzending</translation>
     </message>
 </context>
+<context>
+    <name>OtherHandler</name>
+    <message>
+        <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="obsolete">&lt;qt&gt;&lt;b&gt;Ontvangen:&lt;/b&gt;&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation type="obsolete">Accepteer</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="obsolete">Weiger</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
+        <translation type="obsolete">&lt;p&gt;U heeft een file van het type %1 (&lt;img src=&quot;%2&quot;&gt; ontvangen. Wat wilt u ermee doen?</translation>
+    </message>
+</context>
+<context>
+    <name>SendWidget</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
+        <translation type="obsolete">&lt;qt&gt;&lt;h1&gt;Verzenden:&lt;/h1&gt;&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation type="obsolete">Klaar</translation>
+    </message>
+    <message>
+        <source>IrDa is not enabled!</source>
+        <translation type="obsolete">IrDa staat niet aan!</translation>
+    </message>
+    <message>
+        <source>Searching for IrDa Devices.</source>
+        <translation type="obsolete">Zoek naar IrDa apparaten.</translation>
+    </message>
+    <message>
+        <source>Bluetooth is not available</source>
+        <translation type="obsolete">Bluetooth is niet beschikbaar</translation>
+    </message>
+    <message>
+        <source>Searching for bluetooth Devices.</source>
+        <translation type="obsolete">Zoek naar bluetooth apparaten.</translation>
+    </message>
+    <message>
+        <source>Scheduling for beam.</source>
+        <translation type="obsolete">Plan IrDa verzending.</translation>
+    </message>
+    <message>
+        <source>Click to beam</source>
+        <translation type="obsolete">Klick voor IrDa verzending</translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation type="obsolete">Verzonden</translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="obsolete">Mislukt</translation>
+    </message>
+    <message>
+        <source>Try %1</source>
+        <translation type="obsolete">Poging %1</translation>
+    </message>
+    <message>
+        <source>Search again for IrDa.</source>
+        <translation type="obsolete">Zoek nogmaals naar IrDa.</translation>
+    </message>
+    <message>
+        <source>Start sending</source>
+        <translation type="obsolete">Start verzending</translation>
+    </message>
+</context>
 </TS>