Merge from BRANCH_1_0.

1 files changed, 91 insertions, 17 deletions

diff --git a/i18n/sl/libopieobex.ts b/i18n/sl/libopieobex.ts
index 98588c2..cb21255 100644
--- a/i18n/sl/libopieobex.ts
+++ b/i18n/sl/libopieobex.ts
@@ -48,77 +48,151 @@ k vam.</translation>
     </message>
 </context>
 <context>
+    <name>OpieObex::OtherHandler</name>
+    <message>
+        <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished">&lt;qt&gt;&lt;b&gt;Sprejeto:&lt;/b&gt;&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished">Sprejmi</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished">Zavrni</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="unfinished">&lt;p&gt;Sprejeli ste datoteko tipa %1 (&lt;img src=&quot;%2&quot;&gt; ) Kaj želite narediti?</translation>
+    </message>
+</context>
+<context>
+    <name>OpieObex::SendWidget</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished">&lt;qt&gt;&lt;h1&gt;Pošiljam:&lt;/h1&gt;&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation type="unfinished">Končano</translation>
+    </message>
+    <message>
+        <source>IrDa is not enabled!</source>
+        <translation type="unfinished">IrDa ni vklopljen!</translation>
+    </message>
+    <message>
+        <source>Searching for IrDa Devices.</source>
+        <translation type="unfinished">Iščem IrDa naprave.</translation>
+    </message>
+    <message>
+        <source>Bluetooth is not available</source>
+        <translation type="unfinished">Bluetooth ni na voljo</translation>
+    </message>
+    <message>
+        <source>Searching for bluetooth Devices.</source>
+        <translation type="unfinished">Iščem bluetooth naprave.</translation>
+    </message>
+    <message>
+        <source>Scheduling for beam.</source>
+        <translation type="unfinished">Razvrščam za prežarčenje.</translation>
+    </message>
+    <message>
+        <source>Click to beam</source>
+        <translation type="unfinished">Klikni za prežarčenje</translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation type="unfinished">Poslano</translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished">Napaka</translation>
+    </message>
+    <message>
+        <source>Try %1</source>
+        <translation type="unfinished">Probaj %1</translation>
+    </message>
+    <message>
+        <source>Search again for IrDa.</source>
+        <translation type="unfinished">Ponovno išči IrDa.</translation>
+    </message>
+    <message>
+        <source>Start sending</source>
+        <translation type="unfinished">Začni pošiljati</translation>
+    </message>
+</context>
+<context>
     <name>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;Sprejeto:&lt;/b&gt;&lt;/qt&gt;</translation>
+        <translation type="obsolete">&lt;qt&gt;&lt;b&gt;Sprejeto:&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Accept</source>
-        <translation>Sprejmi</translation>
+        <translation type="obsolete">Sprejmi</translation>
     </message>
     <message>
         <source>Deny</source>
-        <translation>Zavrni</translation>
+        <translation type="obsolete">Zavrni</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;Sprejeli ste datoteko tipa %1 (&lt;img src=&quot;%2&quot;&gt; ) Kaj želite narediti?</translation>
+        <translation type="obsolete">&lt;p&gt;Sprejeli ste datoteko tipa %1 (&lt;img src=&quot;%2&quot;&gt; ) Kaj želite narediti?</translation>
     </message>
 </context>
 <context>
     <name>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;Pošiljam:&lt;/h1&gt;&lt;/qt&gt;</translation>
+        <translation type="obsolete">&lt;qt&gt;&lt;h1&gt;Pošiljam:&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
-        <translation>Končano</translation>
+        <translation type="obsolete">Končano</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
-        <translation>IrDa ni vklopljen!</translation>
+        <translation type="obsolete">IrDa ni vklopljen!</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
-        <translation>Iščem IrDa naprave.</translation>
+        <translation type="obsolete">Iščem IrDa naprave.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
-        <translation>Bluetooth ni na voljo</translation>
+        <translation type="obsolete">Bluetooth ni na voljo</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
-        <translation>Iščem bluetooth naprave.</translation>
+        <translation type="obsolete">Iščem bluetooth naprave.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
-        <translation>Razvrščam za prežarčenje.</translation>
+        <translation type="obsolete">Razvrščam za prežarčenje.</translation>
     </message>
     <message>
         <source>Click to beam</source>
-        <translation>Klikni za prežarčenje</translation>
+        <translation type="obsolete">Klikni za prežarčenje</translation>
     </message>
     <message>
         <source>Sent</source>
-        <translation>Poslano</translation>
+        <translation type="obsolete">Poslano</translation>
     </message>
     <message>
         <source>Failure</source>
-        <translation>Napaka</translation>
+        <translation type="obsolete">Napaka</translation>
     </message>
     <message>
         <source>Try %1</source>
-        <translation>Probaj %1</translation>
+        <translation type="obsolete">Probaj %1</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
-        <translation>Ponovno išči IrDa.</translation>
+        <translation type="obsolete">Ponovno išči IrDa.</translation>
     </message>
     <message>
         <source>Start sending</source>
-        <translation>Začni pošiljati</translation>
+        <translation type="obsolete">Začni pošiljati</translation>
     </message>
 </context>
 </TS>