Merge from BRANCH_1_0.

1 files changed, 47 insertions, 7 deletions

diff --git a/i18n/sl/formatter.ts b/i18n/sl/formatter.ts
index a022e1d..66753c8 100644
--- a/i18n/sl/formatter.ts
+++ b/i18n/sl/formatter.ts
@@ -23,13 +23,13 @@
     </message>
     <message>
         <source>CAUTION:
 Changing parameters on this 
 page may cause your system 
 to stop functioning properly!!</source>
-        <translation>OPOZORILO:
+        <translation type="obsolete">OPOZORILO:
 Spreminjanje parametrov na tej
 strani lahko povzroči, da vaš
 sistem ne bo pravilno deloval!!</translation>
     </message>
     <message>
         <source>Edit fstab</source>
@@ -50,30 +50,30 @@ sistem ne bo pravilno deloval!!</translation>
     <message>
         <source>Advanced</source>
         <translation>Napredno</translation>
     </message>
     <message>
         <source>Format?!?</source>
-        <translation>Format?!?</translation>
+        <translation type="obsolete">Format?!?</translation>
     </message>
     <message>
         <source>Really format
 </source>
         <translation>Zares formatiram
 </translation>
     </message>
     <message>
         <source>
 with </source>
-        <translation>
+        <translation type="obsolete">
 z</translation>
     </message>
     <message>
         <source> filesystem?!?
 You will loose all data!!</source>
-        <translation>datotečnim sistemom?!?
+        <translation type="obsolete">datotečnim sistemom?!?
 Zgubili boste vse podatke!!</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
@@ -127,35 +127,35 @@ has been successfully formatted.</source>
         <translation>
 
 je bila uspešno formatirana.</translation>
     </message>
     <message>
         <source>Trying to mount.</source>
-        <translation>Poizkušam priklopiti.</translation>
+        <translation type="obsolete">Poizkušam priklopiti.</translation>
     </message>
     <message>
         <source>Card mount failed!</source>
         <translation>Priklop kartice ni uspel!</translation>
     </message>
     <message>
         <source>
 has been successfully mounted.</source>
-        <translation>
+        <translation type="obsolete">
 je bila uspešno priklopljena.</translation>
     </message>
     <message>
         <source>You can now close the output window.</source>
         <translation>Zdaj lahko zaprete izhodno okno.</translation>
     </message>
     <message>
         <source>Internal</source>
         <translation>Notranje</translation>
     </message>
     <message>
         <source>Storage Type : </source>
-        <translation>Tip skladišča:</translation>
+        <translation type="obsolete">Tip skladišča:</translation>
     </message>
     <message>
         <source>Total: %1 kB ( %d mB)
 </source>
         <translation>Skupaj: %1 kB ( %d mB)
 </translation>
@@ -167,8 +167,48 @@ je bila uspešno priklopljena.</translation>
 </translation>
     </message>
     <message>
         <source>Available: %1 kB ( %d mB)</source>
         <translation>Na voljo: %1 kB ( %d mB)</translation>
     </message>
+    <message>
+        <source>CAUTION:
+Changing parameters on this
+page may cause your system
+to stop functioning properly!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+with %1 filesystem?
+You will loose all data!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trying to umount %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trying to mount %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1
+has been successfully mounted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Storage Type: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: %1
+Formatted with %2
+%3, %4, %5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>