make lupdate && cvs ci

58 files changed, 1100 insertions, 126 deletions

diff --git a/i18n/de/datebook.ts b/i18n/de/datebook.ts
index 1aa6f97..ffc92fd 100644
--- a/i18n/de/datebook.ts
+++ b/i18n/de/datebook.ts
@@ -701,68 +701,68 @@ und</translation>
         <translation>Häufigkeit</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Endet am:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Kein Enddatum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Wiederholen am</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Mo</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mi</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Fr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>So</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Jeden</translation>
     </message>
     <message>
         <source>Var1</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Var 2</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>WeekVar</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>months</source>
         <translation>Monate</translation>
     </message>
     <message>
         <source>years</source>
         <translation>Jahre</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/kbill.ts b/i18n/de/kbill.ts
index dc743fc..10b6638 100644
--- a/i18n/de/kbill.ts
+++ b/i18n/de/kbill.ts
@@ -1,9 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpDialog</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>KBill</name>
+    <message>
+        <source>kBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Story of kBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The story of KBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The rules of KBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UI</name>
+    <message>
+        <source>After Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your score</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/de/oipkg.ts b/i18n/de/oipkg.ts
index 34965ae..af553d9 100644
--- a/i18n/de/oipkg.ts
+++ b/i18n/de/oipkg.ts
@@ -186,154 +186,158 @@
     </message>
     <message>
         <source>Section:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageListView</name>
     <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettings</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettingsBase</name>
     <message>
         <source>Package Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installation Setups</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Install destination:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used servers:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>link to /</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>volatile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>removeable</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PmIpkg</name>
     <message>
         <source>
 All done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>please wait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while removing </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while installing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Name: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/de/showimg.ts b/i18n/de/showimg.ts
index 0c0b93f..adf816d 100644
--- a/i18n/de/showimg.ts
+++ b/i18n/de/showimg.ts
@@ -20,50 +20,58 @@
     <message>
         <source>Rotate 180</source>
         <translation>180° drehen</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>90° Drehen</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Vollbild</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation>- Bildbetrachter</translation>
     </message>
     <message>
         <source>Loading image...</source>
         <translation>Das Bild wird geladen...</translation>
     </message>
     <message>
         <source>Could not load image</source>
         <translation>Das Bild konnte nicht geladen werden</translation>
     </message>
     <message>
         <source>No image - select Open from File menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1/%2 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, 8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/datebook.ts b/i18n/en/datebook.ts
index 9665047..2e34162 100644
--- a/i18n/en/datebook.ts
+++ b/i18n/en/datebook.ts
@@ -694,68 +694,68 @@ and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Var 2</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>WeekVar</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/kbill.ts b/i18n/en/kbill.ts
index dc743fc..10b6638 100644
--- a/i18n/en/kbill.ts
+++ b/i18n/en/kbill.ts
@@ -1,9 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpDialog</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>KBill</name>
+    <message>
+        <source>kBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Story of kBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The story of KBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The rules of KBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UI</name>
+    <message>
+        <source>After Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your score</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/en/oipkg.ts b/i18n/en/oipkg.ts
index 34965ae..af553d9 100644
--- a/i18n/en/oipkg.ts
+++ b/i18n/en/oipkg.ts
@@ -186,154 +186,158 @@
     </message>
     <message>
         <source>Section:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageListView</name>
     <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettings</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettingsBase</name>
     <message>
         <source>Package Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installation Setups</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Install destination:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used servers:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>link to /</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>volatile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>removeable</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PmIpkg</name>
     <message>
         <source>
 All done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>please wait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while removing </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while installing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Name: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/en/showimg.ts b/i18n/en/showimg.ts
index 0ff41e1..1065cd8 100644
--- a/i18n/en/showimg.ts
+++ b/i18n/en/showimg.ts
@@ -20,50 +20,58 @@
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading image...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not load image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No image - select Open from File menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1/%2 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, 8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/datebook.ts b/i18n/es/datebook.ts
index 2cd5386..e30e604 100644
--- a/i18n/es/datebook.ts
+++ b/i18n/es/datebook.ts
@@ -699,68 +699,68 @@ y </translation>
         <translation>Frecuencia</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Terminar el:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Sin final</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Repetir el</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mié</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Jue</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Vie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Cada</translation>
     </message>
     <message>
         <source>Var1</source>
-        <translation>Var 1</translation>
+        <translation type="obsolete">Var 1</translation>
     </message>
     <message>
         <source>Var 2</source>
-        <translation>Var 2</translation>
+        <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
-        <translation>Var semana</translation>
+        <translation type="obsolete">Var semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation>meses</translation>
     </message>
     <message>
         <source>years</source>
         <translation>años</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/oipkg.ts b/i18n/es/oipkg.ts
index 0bcb392..816c84b 100644
--- a/i18n/es/oipkg.ts
+++ b/i18n/es/oipkg.ts
@@ -186,154 +186,158 @@
     </message>
     <message>
         <source>Section:</source>
         <translation>Sección:</translation>
     </message>
     <message>
         <source>Search: </source>
         <translation>Buscar: </translation>
     </message>
 </context>
 <context>
     <name>PackageListView</name>
     <message>
         <source>Package</source>
         <translation>Paquete</translation>
     </message>
     <message>
         <source>Install to</source>
         <translation>Instalar en</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Reinstall</source>
         <translation>Reinstalar</translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettings</name>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettingsBase</name>
     <message>
         <source>Package Servers</source>
         <translation>Servidores de Paquetes</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <message>
         <source>Installation Setups</source>
-        <translation>Configar instalación</translation>
+        <translation type="obsolete">Configar instalación</translation>
     </message>
     <message>
         <source>Install destination:</source>
         <translation>Destino instalación:</translation>
     </message>
     <message>
         <source>Link to root destination</source>
         <translation>Enlazar al destino root</translation>
     </message>
     <message>
         <source>Used servers:</source>
-        <translation>Servidores usados:</translation>
+        <translation type="obsolete">Servidores usados:</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation>Renombrar</translation>
+        <translation type="obsolete">Renombrar</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation>Servidores</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
         <source>URL:</source>
         <translation>URL:</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation>Destinos</translation>
     </message>
     <message>
         <source>link to /</source>
         <translation>enlazar a /</translation>
     </message>
     <message>
         <source>Remove links</source>
         <translation>Borrar enlaces</translation>
     </message>
     <message>
         <source>volatile</source>
         <translation>volátil</translation>
     </message>
     <message>
         <source>removeable</source>
         <translation>borrable</translation>
     </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PmIpkg</name>
     <message>
         <source>
 All done.</source>
         <translation>
 Todo hecho.</translation>
     </message>
     <message>
         <source>Removing</source>
         <translation>Borrando</translation>
     </message>
     <message>
         <source>please wait</source>
         <translation>por favor espere</translation>
     </message>
     <message>
         <source>Error while removing </source>
         <translation>Error al eliminar</translation>
     </message>
     <message>
         <source>Installing</source>
         <translation>Instalando</translation>
     </message>
     <message>
         <source>Error while installing</source>
         <translation>Error al instalar</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description: </source>
         <translation>Descripción: </translation>
     </message>
     <message>
         <source>Size: </source>
         <translation>Tamaño: </translation>
     </message>
     <message>
         <source>other</source>
         <translation>otros</translation>
     </message>
     <message>
         <source>Install Name: </source>
         <translation>Nombre instalación: </translation>
     </message>
diff --git a/i18n/es/showimg.ts b/i18n/es/showimg.ts
index c515cf6..dd20d8f 100644
--- a/i18n/es/showimg.ts
+++ b/i18n/es/showimg.ts
@@ -20,50 +20,58 @@
     <message>
         <source>Rotate 180</source>
         <translation>Rotar 180º</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>Rotar 90º</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Pantalla completa</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation> - Visor de imágenes</translation>
     </message>
     <message>
         <source>Loading image...</source>
         <translation>Cargando imangen...</translation>
     </message>
     <message>
         <source>Could not load image</source>
         <translation>No puedo cargar imangen</translation>
     </message>
     <message>
         <source>No image - select Open from File menu.</source>
         <translation>Sin imagen - selecione Abrir del menú Fichero.</translation>
     </message>
     <message>
         <source>, %1/%2 colors</source>
         <translation>, %1/%2 colores</translation>
     </message>
     <message>
         <source>, %1 colors</source>
         <translation>, %1 colores</translation>
     </message>
     <message>
         <source> True color</source>
         <translation>Color verdadero</translation>
     </message>
     <message>
         <source>, %1 alpha levels</source>
         <translation>, %1 niveles alpha</translation>
     </message>
     <message>
         <source>, 8-bit alpha channel</source>
         <translation>, canal alpha de 8-bit</translation>
     </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/advancedfm.ts b/i18n/fr/advancedfm.ts
index 567bb8c..af557dd 100644
--- a/i18n/fr/advancedfm.ts
+++ b/i18n/fr/advancedfm.ts
@@ -1,212 +1,212 @@
 <!DOCTYPE TS><TS>
-<codec>iso8859-1</codec>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation>AdvancedFm</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vue</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Montrer les fichiers cachés</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Créer un répertoire</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Renommer</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Exécuter une commande</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Exécuter une commande ayant une sortie</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Effacer</translation>
     </message>
     <message>
         <source>Switch to Local</source>
-        <translation>Basculer vers "Local"</translation>
+        <translation>Basculer vers &quot;Local&quot;</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
-        <translation>Basculer vers "Remote"</translation>
+        <translation>Basculer vers &quot;Remote&quot;</translation>
     </message>
     <message>
         <source>About</source>
         <translation>A propos</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Voulez-vous vraiment effacer</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Impossible de renommer</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Répertoire inexistant</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Copier sous</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Sortie d&apos;AdvancedFm</translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation>la commande n&apos;a pas fonctionnée !</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
-        <translation type='unfinished'></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Envoie Ir.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Changer de répertoire</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Exécuter</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Ouvrir comme text</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Créer un lien symbolique</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Déplacer</translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation>Rafraichir</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Information sur le fichier</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Définir les droits</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propriétés</translation>
     </message>
     <message>
         <source>Beam File</source>
-        <translation type='unfinished'></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation>existe déjà
 Souhaitez-vous vraiment l&apos;effacer ?</translation>
     </message>
     <message>
         <source>Copy </source>
         <translation>Copier</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Sous</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Copier le même répertoire</translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Sauvegarder la sortie dans un fichier</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Définir les droits</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Définir les droits pour :</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propriétaire</translation>
     </message>
     <message>
         <source>group</source>
         <translation>groupe</translation>
     </message>
     <message>
         <source>others</source>
         <translation>autres</translation>
diff --git a/i18n/fr/appearance.ts b/i18n/fr/appearance.ts
index b4ccb49..38d1bda 100644
--- a/i18n/fr/appearance.ts
+++ b/i18n/fr/appearance.ts
@@ -1,259 +1,259 @@
 <!DOCTYPE TS><TS>
-<codec>iso8859-1</codec>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation>Apparence</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Style</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Théme actuel</translation>
     </message>
     <message>
         <source>More</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>More...</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Load</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Sauver</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Couleurs</translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation>Explorer...</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Fond d&apos;écran</translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation>Editer le thème actuel...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Effacer</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Voulez-vous vraiment effeacer</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Effacer le thème</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Impossible d&apos;effacer le thème actuel.</translation>
     </message>
     <message>
         <source>Do you want to apply your changes?
 </source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Open File</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Select</source>
         <translation>Sélectionner</translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation>Activer l&apos;image de fond</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Réglage par défaut</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>Voix ambiguë d&apos;un coeur qui au zéphyr préfère les jattes de kiwis</translation>
     </message>
     <message>
         <source>Apply</source>
         <translation>Appliquer</translation>
     </message>
     <message>
         <source>Restart</source>
         <translation>Redémarer</translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation>Souhaitez-vous redémarrer Opie maintenant ?</translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation>Préférences...</translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Editer le thème</translation>
     </message>
     <message>
         <source>More</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>More...</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
 </context>
 <context>
     <name>QColorDialog</name>
     <message>
         <source>Hue:</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Sat:</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Val:</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Red:</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Green:</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Blue:</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Alpha channel:</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Select color</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
 </context>
 <context>
     <name>fileBrowser</name>
     <message>
         <source>Name</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Documents</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>All files</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Hidden files</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Type: %1</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Change Directory</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Make Directory</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Rescan</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>All</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Note</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Could not rename</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source> ?
 It must be empty</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>No</source>
-        <translation type='obsolete'></translation>
+        <translation type="obsolete"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/appskey.ts b/i18n/fr/appskey.ts
index c6e1059..f318d8e 100644
--- a/i18n/fr/appskey.ts
+++ b/i18n/fr/appskey.ts
@@ -1,30 +1,30 @@
 <!DOCTYPE TS><TS>
-<codec>iso8859-1</codec>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AppsKeyApp</name>
     <message>
         <source>Set Application Key</source>
         <translation>Définir les touches du PDA</translation>
     </message>
     <message>
         <source>Calender</source>
         <translation>Calendrier</translation>
     </message>
     <message>
         <source>Address Book</source>
         <translation>Carnet d&apos;adresses</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Répertoire personnel</translation>
     </message>
     <message>
         <source>Popup Menu</source>
         <translation>Menu</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Courrier</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/datebook.ts b/i18n/fr/datebook.ts
index 9665047..2e34162 100644
--- a/i18n/fr/datebook.ts
+++ b/i18n/fr/datebook.ts
@@ -694,68 +694,68 @@ and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Var 2</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>WeekVar</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/kbill.ts b/i18n/fr/kbill.ts
index dc743fc..10b6638 100644
--- a/i18n/fr/kbill.ts
+++ b/i18n/fr/kbill.ts
@@ -1,9 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpDialog</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>KBill</name>
+    <message>
+        <source>kBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Story of kBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The story of KBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The rules of KBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UI</name>
+    <message>
+        <source>After Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your score</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/oipkg.ts b/i18n/fr/oipkg.ts
index 34965ae..af553d9 100644
--- a/i18n/fr/oipkg.ts
+++ b/i18n/fr/oipkg.ts
@@ -186,154 +186,158 @@
     </message>
     <message>
         <source>Section:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageListView</name>
     <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettings</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettingsBase</name>
     <message>
         <source>Package Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installation Setups</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Install destination:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used servers:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>link to /</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>volatile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>removeable</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PmIpkg</name>
     <message>
         <source>
 All done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>please wait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while removing </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while installing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Name: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/fr/showimg.ts b/i18n/fr/showimg.ts
index 0ff41e1..1065cd8 100644
--- a/i18n/fr/showimg.ts
+++ b/i18n/fr/showimg.ts
@@ -20,50 +20,58 @@
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading image...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not load image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No image - select Open from File menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1/%2 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, 8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/datebook.ts b/i18n/hu/datebook.ts
index 9665047..2e34162 100644
--- a/i18n/hu/datebook.ts
+++ b/i18n/hu/datebook.ts
@@ -694,68 +694,68 @@ and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Var 2</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>WeekVar</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/kbill.ts b/i18n/hu/kbill.ts
index dc743fc..10b6638 100644
--- a/i18n/hu/kbill.ts
+++ b/i18n/hu/kbill.ts
@@ -1,9 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpDialog</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>KBill</name>
+    <message>
+        <source>kBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Story of kBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The story of KBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The rules of KBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UI</name>
+    <message>
+        <source>After Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your score</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/hu/oipkg.ts b/i18n/hu/oipkg.ts
index 34965ae..af553d9 100644
--- a/i18n/hu/oipkg.ts
+++ b/i18n/hu/oipkg.ts
@@ -186,154 +186,158 @@
     </message>
     <message>
         <source>Section:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageListView</name>
     <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettings</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettingsBase</name>
     <message>
         <source>Package Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installation Setups</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Install destination:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used servers:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>link to /</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>volatile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>removeable</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PmIpkg</name>
     <message>
         <source>
 All done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>please wait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while removing </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while installing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Name: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/hu/showimg.ts b/i18n/hu/showimg.ts
index 0ff41e1..1065cd8 100644
--- a/i18n/hu/showimg.ts
+++ b/i18n/hu/showimg.ts
@@ -20,50 +20,58 @@
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading image...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not load image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No image - select Open from File menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1/%2 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, 8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ja/datebook.ts b/i18n/ja/datebook.ts
index 9665047..2e34162 100644
--- a/i18n/ja/datebook.ts
+++ b/i18n/ja/datebook.ts
@@ -694,68 +694,68 @@ and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Var 2</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>WeekVar</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/kbill.ts b/i18n/ja/kbill.ts
index dc743fc..10b6638 100644
--- a/i18n/ja/kbill.ts
+++ b/i18n/ja/kbill.ts
@@ -1,9 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpDialog</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>KBill</name>
+    <message>
+        <source>kBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Story of kBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The story of KBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The rules of KBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UI</name>
+    <message>
+        <source>After Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your score</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ja/oipkg.ts b/i18n/ja/oipkg.ts
index 34965ae..af553d9 100644
--- a/i18n/ja/oipkg.ts
+++ b/i18n/ja/oipkg.ts
@@ -186,154 +186,158 @@
     </message>
     <message>
         <source>Section:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageListView</name>
     <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettings</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettingsBase</name>
     <message>
         <source>Package Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installation Setups</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Install destination:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used servers:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>link to /</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>volatile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>removeable</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PmIpkg</name>
     <message>
         <source>
 All done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>please wait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while removing </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while installing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Name: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/ja/showimg.ts b/i18n/ja/showimg.ts
index 0ff41e1..1065cd8 100644
--- a/i18n/ja/showimg.ts
+++ b/i18n/ja/showimg.ts
@@ -20,50 +20,58 @@
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading image...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not load image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No image - select Open from File menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1/%2 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, 8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ko/datebook.ts b/i18n/ko/datebook.ts
index 9665047..2e34162 100644
--- a/i18n/ko/datebook.ts
+++ b/i18n/ko/datebook.ts
@@ -694,68 +694,68 @@ and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Var 2</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>WeekVar</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/kbill.ts b/i18n/ko/kbill.ts
index dc743fc..10b6638 100644
--- a/i18n/ko/kbill.ts
+++ b/i18n/ko/kbill.ts
@@ -1,9 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpDialog</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>KBill</name>
+    <message>
+        <source>kBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Story of kBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The story of KBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The rules of KBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UI</name>
+    <message>
+        <source>After Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your score</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ko/oipkg.ts b/i18n/ko/oipkg.ts
index 34965ae..af553d9 100644
--- a/i18n/ko/oipkg.ts
+++ b/i18n/ko/oipkg.ts
@@ -186,154 +186,158 @@
     </message>
     <message>
         <source>Section:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageListView</name>
     <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettings</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettingsBase</name>
     <message>
         <source>Package Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installation Setups</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Install destination:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used servers:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>link to /</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>volatile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>removeable</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PmIpkg</name>
     <message>
         <source>
 All done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>please wait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while removing </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while installing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Name: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/ko/showimg.ts b/i18n/ko/showimg.ts
index 0ff41e1..1065cd8 100644
--- a/i18n/ko/showimg.ts
+++ b/i18n/ko/showimg.ts
@@ -20,50 +20,58 @@
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading image...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not load image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No image - select Open from File menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1/%2 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, 8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/datebook.ts b/i18n/no/datebook.ts
index 9665047..2e34162 100644
--- a/i18n/no/datebook.ts
+++ b/i18n/no/datebook.ts
@@ -694,68 +694,68 @@ and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Var 2</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>WeekVar</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/kbill.ts b/i18n/no/kbill.ts
index dc743fc..10b6638 100644
--- a/i18n/no/kbill.ts
+++ b/i18n/no/kbill.ts
@@ -1,9 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpDialog</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>KBill</name>
+    <message>
+        <source>kBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Story of kBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The story of KBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The rules of KBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UI</name>
+    <message>
+        <source>After Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your score</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/no/oipkg.ts b/i18n/no/oipkg.ts
index 34965ae..af553d9 100644
--- a/i18n/no/oipkg.ts
+++ b/i18n/no/oipkg.ts
@@ -186,154 +186,158 @@
     </message>
     <message>
         <source>Section:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageListView</name>
     <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettings</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettingsBase</name>
     <message>
         <source>Package Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installation Setups</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Install destination:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used servers:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>link to /</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>volatile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>removeable</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PmIpkg</name>
     <message>
         <source>
 All done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>please wait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while removing </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while installing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Name: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/no/showimg.ts b/i18n/no/showimg.ts
index 0ff41e1..1065cd8 100644
--- a/i18n/no/showimg.ts
+++ b/i18n/no/showimg.ts
@@ -20,50 +20,58 @@
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading image...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not load image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No image - select Open from File menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1/%2 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, 8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/datebook.ts b/i18n/pl/datebook.ts
index 3e1a5bf..98e5bf8 100644
--- a/i18n/pl/datebook.ts
+++ b/i18n/pl/datebook.ts
@@ -700,68 +700,68 @@ i </translation>
         <translation>Czestotliwosc</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Konic o:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Bez konca</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Powtarzaj o:</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Wto</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Sro</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Czw</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Pio</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Nie</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Kazdego</translation>
     </message>
     <message>
         <source>Var1</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Var 2</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>WeekVar</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>months</source>
         <translation>miesiecy</translation>
     </message>
     <message>
         <source>years</source>
         <translation>lat</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/kbill.ts b/i18n/pl/kbill.ts
index dc743fc..10b6638 100644
--- a/i18n/pl/kbill.ts
+++ b/i18n/pl/kbill.ts
@@ -1,9 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpDialog</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>KBill</name>
+    <message>
+        <source>kBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Story of kBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The story of KBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The rules of KBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UI</name>
+    <message>
+        <source>After Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your score</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pl/oipkg.ts b/i18n/pl/oipkg.ts
index 34965ae..af553d9 100644
--- a/i18n/pl/oipkg.ts
+++ b/i18n/pl/oipkg.ts
@@ -186,154 +186,158 @@
     </message>
     <message>
         <source>Section:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageListView</name>
     <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettings</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettingsBase</name>
     <message>
         <source>Package Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installation Setups</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Install destination:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used servers:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>link to /</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>volatile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>removeable</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PmIpkg</name>
     <message>
         <source>
 All done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>please wait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while removing </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while installing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Name: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pl/showimg.ts b/i18n/pl/showimg.ts
index 9a0526d..924cebc 100644
--- a/i18n/pl/showimg.ts
+++ b/i18n/pl/showimg.ts
@@ -20,50 +20,58 @@
     <message>
         <source>Rotate 180</source>
         <translation>Obroc o 180</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>Obroc o 90</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Pelny ekran</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation> - Przegladarka obrazow</translation>
     </message>
     <message>
         <source>Loading image...</source>
         <translation>Laduje obraz</translation>
     </message>
     <message>
         <source>Could not load image</source>
         <translation>Nie moge zaladowac obrazu</translation>
     </message>
     <message>
         <source>No image - select Open from File menu.</source>
         <translation>Brak obrazu - wybierz Otworz z menu Plik</translation>
     </message>
     <message>
         <source>, %1/%2 colors</source>
         <translation>, %1/%2 kolorow</translation>
     </message>
     <message>
         <source>, %1 colors</source>
         <translation>, %1 kolorow</translation>
     </message>
     <message>
         <source> True color</source>
         <translation> Pelny kolor</translation>
     </message>
     <message>
         <source>, %1 alpha levels</source>
         <translation> %1 poziomow alfa</translation>
     </message>
     <message>
         <source>, 8-bit alpha channel</source>
         <translation> 8-bit kanal alfa</translation>
     </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/datebook.ts b/i18n/pt/datebook.ts
index a7119ad..4589c3b 100644
--- a/i18n/pt/datebook.ts
+++ b/i18n/pt/datebook.ts
@@ -667,68 +667,68 @@ and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Var 2</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>WeekVar</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/kbill.ts b/i18n/pt/kbill.ts
index d1ab947..d1597cb 100644
--- a/i18n/pt/kbill.ts
+++ b/i18n/pt/kbill.ts
@@ -1,9 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpDialog</name>
     <message>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
 </context>
+<context>
+    <name>KBill</name>
+    <message>
+        <source>kBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Story of kBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The story of KBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The rules of KBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UI</name>
+    <message>
+        <source>After Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your score</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/oipkg.ts b/i18n/pt/oipkg.ts
index 34965ae..af553d9 100644
--- a/i18n/pt/oipkg.ts
+++ b/i18n/pt/oipkg.ts
@@ -186,154 +186,158 @@
     </message>
     <message>
         <source>Section:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageListView</name>
     <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettings</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettingsBase</name>
     <message>
         <source>Package Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installation Setups</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Install destination:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used servers:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>link to /</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>volatile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>removeable</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PmIpkg</name>
     <message>
         <source>
 All done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>please wait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while removing </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while installing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Name: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pt/showimg.ts b/i18n/pt/showimg.ts
index c33379d..3d21c30 100644
--- a/i18n/pt/showimg.ts
+++ b/i18n/pt/showimg.ts
@@ -20,50 +20,58 @@
     <message>
         <source>Rotate 180</source>
         <translation>Rodar 180º</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>Rodar 90º</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Ecrâ Todo</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation>- Leitor Imagens</translation>
     </message>
     <message>
         <source>Loading image...</source>
         <translation>A ler a imagem...</translation>
     </message>
     <message>
         <source>Could not load image</source>
         <translation>Erro ao carregar a imagem</translation>
     </message>
     <message>
         <source>No image - select Open from File menu.</source>
         <translation>Sem imagens - seleccione Abrir no menu.</translation>
     </message>
     <message>
         <source>, %1/%2 colors</source>
         <translation>, %1/%2 cores</translation>
     </message>
     <message>
         <source>, %1 colors</source>
         <translation>, %1 cores</translation>
     </message>
     <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 alpha levels</source>
         <translation type="unfinished">, %1 níveis</translation>
     </message>
     <message>
         <source>, 8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/datebook.ts b/i18n/pt_BR/datebook.ts
index 056259f..026ba2f 100644
--- a/i18n/pt_BR/datebook.ts
+++ b/i18n/pt_BR/datebook.ts
@@ -733,60 +733,60 @@ e </translation>
         <translation type="unfinished">Semana</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Ano</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Todo(a)</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Mês</translation>
     </message>
     <message>
         <source>years</source>
         <translation>anos</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Sem Data Final</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Todo(a):</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Repetir Em</translation>
     </message>
     <message>
         <source>months</source>
         <translation>meses</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Fim Em:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Freqüência</translation>
     </message>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Evento Repetitivo </translation>
     </message>
     <message>
         <source>Var1</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Var 2</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>WeekVar</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/kbill.ts b/i18n/pt_BR/kbill.ts
index dc743fc..10b6638 100644
--- a/i18n/pt_BR/kbill.ts
+++ b/i18n/pt_BR/kbill.ts
@@ -1,9 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpDialog</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>KBill</name>
+    <message>
+        <source>kBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Story of kBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The story of KBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The rules of KBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UI</name>
+    <message>
+        <source>After Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your score</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt_BR/oipkg.ts b/i18n/pt_BR/oipkg.ts
index 34965ae..af553d9 100644
--- a/i18n/pt_BR/oipkg.ts
+++ b/i18n/pt_BR/oipkg.ts
@@ -186,154 +186,158 @@
     </message>
     <message>
         <source>Section:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageListView</name>
     <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettings</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettingsBase</name>
     <message>
         <source>Package Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installation Setups</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Install destination:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used servers:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>link to /</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>volatile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>removeable</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PmIpkg</name>
     <message>
         <source>
 All done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>please wait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while removing </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while installing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Name: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pt_BR/showimg.ts b/i18n/pt_BR/showimg.ts
index 980df25..40d0e67 100644
--- a/i18n/pt_BR/showimg.ts
+++ b/i18n/pt_BR/showimg.ts
@@ -21,50 +21,58 @@
     <message>
         <source>, 8-bit alpha channel</source>
         <translation>, canal alfa de 8 bits</translation>
     </message>
     <message>
         <source>Could not load image</source>
         <translation>Não foi possível carregar imagem</translation>
     </message>
     <message>
         <source>, %1 colors</source>
         <translation>, %1 cores</translation>
     </message>
     <message>
         <source> True color</source>
         <translation>Cores reais</translation>
     </message>
     <message>
         <source>Loading image...</source>
         <translation>Carregando imagem...</translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation>Giro vertical</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation>Giro horizontal</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/datebook.ts b/i18n/sl/datebook.ts
index 97d4d49..84dcdfd 100644
--- a/i18n/sl/datebook.ts
+++ b/i18n/sl/datebook.ts
@@ -909,68 +909,68 @@ in</translation>
         <translation>Frekvenca</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Končaj na:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Brez končnega datuma</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Ponovi</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Tor</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Sre</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Čet</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Pet</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Ned</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Vsak</translation>
     </message>
     <message>
         <source>Var1</source>
-        <translation>Spremenljivka1</translation>
+        <translation type="obsolete">Spremenljivka1</translation>
     </message>
     <message>
         <source>Var 2</source>
-        <translation>Spremenljivka 2</translation>
+        <translation type="obsolete">Spremenljivka 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
-        <translation>TedenskaSpremenljivka</translation>
+        <translation type="obsolete">TedenskaSpremenljivka</translation>
     </message>
     <message>
         <source>months</source>
         <translation>meseci</translation>
     </message>
     <message>
         <source>years</source>
         <translation>leta</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/kbill.ts b/i18n/sl/kbill.ts
index dc743fc..10b6638 100644
--- a/i18n/sl/kbill.ts
+++ b/i18n/sl/kbill.ts
@@ -1,9 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpDialog</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>KBill</name>
+    <message>
+        <source>kBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Story of kBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The story of KBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The rules of KBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UI</name>
+    <message>
+        <source>After Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your score</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/oipkg.ts b/i18n/sl/oipkg.ts
index 34965ae..af553d9 100644
--- a/i18n/sl/oipkg.ts
+++ b/i18n/sl/oipkg.ts
@@ -186,154 +186,158 @@
     </message>
     <message>
         <source>Section:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageListView</name>
     <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettings</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettingsBase</name>
     <message>
         <source>Package Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installation Setups</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Install destination:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used servers:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>link to /</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>volatile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>removeable</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PmIpkg</name>
     <message>
         <source>
 All done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>please wait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while removing </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while installing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Name: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/sl/showimg.ts b/i18n/sl/showimg.ts
index 691e25e..4bf1259 100644
--- a/i18n/sl/showimg.ts
+++ b/i18n/sl/showimg.ts
@@ -20,50 +20,58 @@
     <message>
         <source>Rotate 180</source>
         <translation>Obrni za 180</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>Obrni za 90</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Cel zaslon</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation>- Pregledovalnik slik</translation>
     </message>
     <message>
         <source>Loading image...</source>
         <translation>Nalagam sliko...</translation>
     </message>
     <message>
         <source>Could not load image</source>
         <translation>Ne uspem naložiti slike</translation>
     </message>
     <message>
         <source>No image - select Open from File menu.</source>
         <translation>Ni slike - izberite Odpri iz Datoteka menuja.</translation>
     </message>
     <message>
         <source>, %1/%2 colors</source>
         <translation>, %1/%2 barv</translation>
     </message>
     <message>
         <source>, %1 colors</source>
         <translation>, %1 barv</translation>
     </message>
     <message>
         <source> True color</source>
         <translation>Resnične barve</translation>
     </message>
     <message>
         <source>, %1 alpha levels</source>
         <translation>, %1 alfa stopnje</translation>
     </message>
     <message>
         <source>, 8-bit alpha channel</source>
         <translation>, 8-bit alfa kanal</translation>
     </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/datebook.ts b/i18n/zh_CN/datebook.ts
index 9665047..2e34162 100644
--- a/i18n/zh_CN/datebook.ts
+++ b/i18n/zh_CN/datebook.ts
@@ -694,68 +694,68 @@ and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Var 2</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>WeekVar</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/kbill.ts b/i18n/zh_CN/kbill.ts
index dc743fc..10b6638 100644
--- a/i18n/zh_CN/kbill.ts
+++ b/i18n/zh_CN/kbill.ts
@@ -1,9 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpDialog</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>KBill</name>
+    <message>
+        <source>kBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Story of kBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The story of KBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The rules of KBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UI</name>
+    <message>
+        <source>After Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your score</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_CN/oipkg.ts b/i18n/zh_CN/oipkg.ts
index 34965ae..af553d9 100644
--- a/i18n/zh_CN/oipkg.ts
+++ b/i18n/zh_CN/oipkg.ts
@@ -186,154 +186,158 @@
     </message>
     <message>
         <source>Section:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageListView</name>
     <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettings</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettingsBase</name>
     <message>
         <source>Package Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installation Setups</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Install destination:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used servers:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>link to /</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>volatile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>removeable</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PmIpkg</name>
     <message>
         <source>
 All done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>please wait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while removing </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while installing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Name: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_CN/showimg.ts b/i18n/zh_CN/showimg.ts
index 0ff41e1..1065cd8 100644
--- a/i18n/zh_CN/showimg.ts
+++ b/i18n/zh_CN/showimg.ts
@@ -20,50 +20,58 @@
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading image...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not load image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No image - select Open from File menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1/%2 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, 8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/datebook.ts b/i18n/zh_TW/datebook.ts
index 9665047..2e34162 100644
--- a/i18n/zh_TW/datebook.ts
+++ b/i18n/zh_TW/datebook.ts
@@ -694,68 +694,68 @@ and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Var 2</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>WeekVar</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/kbill.ts b/i18n/zh_TW/kbill.ts
index dc743fc..10b6638 100644
--- a/i18n/zh_TW/kbill.ts
+++ b/i18n/zh_TW/kbill.ts
@@ -1,9 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpDialog</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>KBill</name>
+    <message>
+        <source>kBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Story of kBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The story of KBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The rules of KBill</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UI</name>
+    <message>
+        <source>After Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your score</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/oipkg.ts b/i18n/zh_TW/oipkg.ts
index 34965ae..af553d9 100644
--- a/i18n/zh_TW/oipkg.ts
+++ b/i18n/zh_TW/oipkg.ts
@@ -186,154 +186,158 @@
     </message>
     <message>
         <source>Section:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageListView</name>
     <message>
         <source>Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettings</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageManagerSettingsBase</name>
     <message>
         <source>Package Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installation Setups</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Install destination:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used servers:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>link to /</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>volatile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>removeable</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PmIpkg</name>
     <message>
         <source>
 All done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>please wait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while removing </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while installing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Name: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/showimg.ts b/i18n/zh_TW/showimg.ts
index 0ff41e1..1065cd8 100644
--- a/i18n/zh_TW/showimg.ts
+++ b/i18n/zh_TW/showimg.ts
@@ -20,50 +20,58 @@
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading image...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not load image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No image - select Open from File menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1/%2 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, %1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, 8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>