Merge from BRANCH_1_0.

1 files changed, 37 insertions, 16 deletions

diff --git a/i18n/sl/today.ts b/i18n/sl/today.ts
index 9d95b1b..b8a4f9f 100644
--- a/i18n/sl/today.ts
+++ b/i18n/sl/today.ts
@@ -1,117 +1,138 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Danes</translation>
     </message>
     <message>
         <source>Owned by </source>
-        <translation>Lastnik je</translation>
+        <translation type="unfinished">Lastnik je</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Prosim izplonite poslovno kartico</translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation type="unfinished">Danes</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
-        <source>Today config</source>
-        <translation type="unfinished">Nastavitve Danes</translation>
-    </message>
-    <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active/order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>autostart on 
-resume?
- (Opie only)</source>
+        <source>Misc</source>
+        <translation type="unfinished">Različno</translation>
+    </message>
+    <message>
+        <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>minutes inactive</source>
+        <source>Today Config</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TodayConfigMiscBase</name>
     <message>
-        <source>Misc</source>
-        <translation type="unfinished">Različno</translation>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>autostart on resume?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tiny banner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Have small banner </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Icon size</source>
+        <source>minutes inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set the icon size in pixel</source>
+        <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Refresh</source>
+        <source>Set the icon size in pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How often should Today refresh itself</source>
+        <source>icon size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
+        <source>How often should Today refresh itself</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>refresh</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>