More language fixes

33 files changed, 608 insertions, 612 deletions

diff --git a/i18n/da/libqpe.ts b/i18n/da/libqpe.ts
index 97f6329..7de7f87 100644
--- a/i18n/da/libqpe.ts
+++ b/i18n/da/libqpe.ts
@@ -701,206 +701,203 @@ Frigør noget hukommelse og prøv igen.</translation>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mon</source>
+        <translation type="unfinished">Man</translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation type="unfinished">Tir</translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation type="unfinished">Ons</translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation type="unfinished">Tor</translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation type="unfinished">Fre</translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation type="unfinished">Lør</translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation type="unfinished">Søn</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 dokument</translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;Der findes ikke nogen omfattende hjælp til dette program, men der er stadig kontekstfølsom hjælp.&lt;p&gt;Sådan bruger du kontekstfølsom hjælp:&lt;p&gt;&lt;ol&gt;&lt;li&gt;klik og hold hjælpeknappen&lt;li&gt;når vindues titlen viser &lt;b&gt;Hvad er det...&lt;/b&gt;, så klik på det du vil have hjælp med.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Hvad er det...</translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation>Klik for at lukke dette vindue og kassere ændringer.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation>Klik for at lukke dette vindue.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation>Klik for at lukke dette vindue og anvende ændringer.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation>Klik for at gøre dette vindue flytbart.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation>Klik for at få dette vindue til at bruge hele skærmen.</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF Kort</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Harddisk</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD Kort</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC Kort</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI Harddisk</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Intern Hukommelse</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Internt Lager</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
 </context>
 <context>
-    <name>TimeString</name>
-    <message>
-        <source>Mon</source>
-        <translation type="unfinished">Man</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="unfinished">Tir</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="unfinished">Ons</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="unfinished">Tor</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="unfinished">Fre</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="unfinished">Lør</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="unfinished">Søn</translation>
-    </message>
-</context>
-<context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>&apos;citytime&apos; programmet blev ikke fundet</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>For at vælge tidszoner,
 skal du installere &apos;citytime&apos;.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Ikke mere lagerplads</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Kunne ikke planlægge alarmen.
 Frigør noget lagerplads og prøv igen</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 filer</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Alle %1 filer</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Alle filer</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libtodayaddressbookplugin.ts b/i18n/da/libtodayaddressbookplugin.ts
index 2f40ece..5c4bd5d 100644
--- a/i18n/da/libtodayaddressbookplugin.ts
+++ b/i18n/da/libtodayaddressbookplugin.ts
@@ -19,75 +19,78 @@
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>AddressBook plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AddressBookPluginWidget</name>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>AddressBook plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/de/addressbook.ts b/i18n/de/addressbook.ts
index f81d1f1..129131c 100644
--- a/i18n/de/addressbook.ts
+++ b/i18n/de/addressbook.ts
@@ -54,259 +54,259 @@
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Persönliche Daten</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Während der Synchronisation ist das Bearbeiten nicht möglich</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Persönliche Daten ändern</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Adresse ändern</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Adressbuch - Meine persönlichen Daten</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Nicht genügend Speicher</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Sicherung fehlgeschlagen
 Bitte sorgen Sie für mehr
 Speicherplatz und versuchen
 sie es erneut.
 
 Dennoch beenden?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>nicht eingeteilt</translation>
+        <translation>nicht zugewiesen</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Suche schließen</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>Daten speichern</translation>
     </message>
     <message>
         <source>Config</source>
-        <translation>Konfigurations</translation>
+        <translation>Einstellungen</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Nicht gefunden</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Liste</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Karten</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>Karte</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Suche starten</translation>
     </message>
     <message>
         <source>Right file type ?</source>
-        <translation>Korrekter Dateityp?</translation>
+        <translation>Korrekter Dateityp ?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Nein</translation>
     </message>
     <message>
         <source>Unable to find a contact for this 
  search pattern!</source>
-        <translation>Suchmuster konnte nicht gefunden werden!</translation>
+        <translation>Suchmuster konnte nicht gefunden werden !</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Die ausgewählte Datei endet
-nicht mit &quot;.vcf&quot;. Wollen Sie sie
-trotzdem öffnen?</translation>
+nicht mit &quot;.vcf&quot;. 
+Wollen Sie sie trotzdem öffnen ?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Kontakt hinzufügen?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Wollen Sie den Kontakt %1 wirklich
 hinzufügen?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
-        <translation>&amp;Alle Ja</translation>
+        <translation>&amp;Ja, alle</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Eingabemuster</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Benutze reguläre Ausdrücke</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Benutze Wildcards (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Beachte Großschreibung</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Mail</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Bevorzuge QT-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Bevorzuge Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Beachte: QT-Mail is nur im Sharp Default-Rom enthalten. Opie-Mail
 ist frei erhältlich !</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Verschiedenes</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Sucheinstellungen</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Schrift</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Klein</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Groß</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Reihenfolge</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
-        <translation>Wähle Reihenfolge für Kontakt:</translation>
+        <translation>Wähle Reihenfolge für Kontakt: </translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Hoch</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Runter</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message>
         <source>Configuration</source>
-        <translation>Konfiguration</translation>
+        <translation>Einstellungen</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Vorname</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Mittlerer Name</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nachname</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffix</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Speichern unter</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Geschlecht</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Berufsbezeichnung</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organisation</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Voller Name...</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notizen...</translation>
     </message>
@@ -1194,204 +1194,204 @@ ist frei erhältlich !</translation>
         <source>Guadeloupe</source>
         <translation>Guadeloupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Guinea-Bissau</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Jamaika</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Kiribati</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Kyrgyzstan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Palestina</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Pitcairn Inseln</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation>Tel. gesch.</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax gesch.</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Handy gesch.</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>Haupt-E-Mail</translation>
+        <translation>Gesch. Tel.</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>E-Mails</translation>
     </message>
     <message>
         <source>Home Phone</source>
-        <translation>Telefonnummer</translation>
+        <translation>Priv. Telefon</translation>
     </message>
     <message>
         <source>Home Fax</source>
-        <translation>Fax privat</translation>
+        <translation>Priv. Fax</translation>
     </message>
     <message>
         <source>Home Mobile</source>
-        <translation>Handy privat</translation>
+        <translation>Priv. Handy</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Büro</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Beruf</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Manager</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Ehepartner</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Geschlecht</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Geburtstag</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Jahrestag</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Spitzname</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Kinder</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Titel</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Vorname</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Mittlerer Name</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nachname</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffix</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Speichern unter</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Berufsbezeichnung</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Abteilung</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Firma</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Straße, gesch.</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation>Stadt, gesch.</translation>
+        <translation>Gesch. Stadt</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation>Staat, gesch.</translation>
+        <translation>Gesch. Staat</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation>Postleitzahl, gesch.</translation>
+        <translation>Gesch. PLZ</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation>Land, gesch.</translation>
+        <translation>Gesch. Land</translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation>Pager, gesch.</translation>
+        <translation>Gesch. Pager</translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation>Web, gesch.</translation>
+        <translation>Gesch. Web</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation>Straße, privat</translation>
+        <translation>Priv. Straße</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation>Stadt, privat</translation>
+        <translation>Priv. Stadt</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation>Staat, privat</translation>
+        <translation>Priv. Staat</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation>Postleitzahl, privat</translation>
+        <translation>Priv. PLZ</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation>Land, privat</translation>
+        <translation>Priv. Land</translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation>Web, privat</translation>
+        <translation>Priv. Webseite</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Gruppen</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libbatteryapplet.ts b/i18n/de/libbatteryapplet.ts
index b5798d0..05173b6 100644
--- a/i18n/de/libbatteryapplet.ts
+++ b/i18n/de/libbatteryapplet.ts
@@ -1,86 +1,86 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Battery status for Ipaq</source>
         <translation>Batteriestatus für den iPAQ</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>konnte Datei nicht öffnen</translation>
     </message>
     <message>
         <source>Charging both devices</source>
-        <translation>Beide Einheiten werden geladen</translation>
+        <translation>Beide Akkus werden geladen</translation>
     </message>
     <message>
         <source>Charging</source>
         <translation>Lade...</translation>
     </message>
     <message>
         <source>Percentage battery remaining</source>
-        <translation>Verbleibende Energie in Prozent:</translation>
+        <translation>Verbleibende Energie in Prozent: </translation>
     </message>
     <message>
         <source>Battery status: </source>
-        <translation>Batteriestatus:</translation>
+        <translation>Batteriestatus: </translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Gut</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Niedrig</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Sehr niedrig</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Kritisch</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>Ersatzversorgung</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Netzbetrieb</translation>
     </message>
     <message>
         <source>External power disconnected</source>
-        <translation>Externe Stromquelle nicht mehr verbuden</translation>
+        <translation>Vom Netz getrennt</translation>
     </message>
     <message>
         <source>Battery time remaining</source>
         <translation>Verbleibende Batteriezeit</translation>
     </message>
     <message>
         <source>Percentage battery remaining: </source>
         <translation>Verbleibende Energie in Prozent:</translation>
     </message>
     <message>
         <source>Battery time remaining: </source>
         <translation>Verbleibende Batteriezeit:</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation>Keine Zusatzbatterie angeschlossen</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libqpe.ts b/i18n/de/libqpe.ts
index 8bdd6c5..69f7835 100644
--- a/i18n/de/libqpe.ts
+++ b/i18n/de/libqpe.ts
@@ -1,164 +1,163 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Nicht zugewiesen</translation>
     </message>
     <message>
         <source> (multi.)</source>
-        <translation>Mehrere</translation>
+        <translation>(Mehrere)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Geschäftlich</translation>
     </message>
     <message>
         <source>Personal</source>
-        <translation>Persönlich</translation>
+        <translation>Privat</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
-        <translation>Mehrere</translation>
+        <translation>(Mehrere)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Neue Kategorie</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Neue Kategorie</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Kategorie bearbeiten</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Kategorien</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Anwendung</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Kategorien hier hinein</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Global</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Überprüfen Sie die Kategorie zu der dieses Dokument gehört.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Bitte geben Sie eine neue Kategorie ein. Drücken Sie &lt;b&gt;Neu&lt;/b&gt; um sie zur Liste hinzuzufügen.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Sie können links eine neue Kategorie einfügen und durch Drücken von &lt;b&gt;Neu&lt;/b&gt; sie zur Liste hinzuzufügen.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Hier drücken, um eine ausgewählte Kategorie zu entfernen.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Auswählen um diese Eigenschaft allen Anwendungen verfügbar zu machen.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>Nicht zugeordnet</translation>
+        <translation>Nicht zugewiesen</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
-        <translation>Tut mir leid.
-Eine andere Anwendung bearbeitet gerade 
+        <translation>Eine andere Anwendung bearbeitet gerade 
 die Kategorien.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Kategorien bearbeiten</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Januar des ausgewählten Jahres anzeigen</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Vorherigen Monat anzeigen</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Nächsten Monat anzeigen</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Dezember des ausgewälten Jahres anzeigen</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Filedialog schliessen</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Dokumente dieses Typs anzeigen</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Dokumentenansicht</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Dokumente dieser Kategorie anzeigen</translation>
     </message>
@@ -479,117 +478,117 @@ frei und versuchen Sie es noch einmal
         <translation>Wollen Sie %1 wirklich entfernen ?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Nicht zugeordnet</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Adresse gesch.&lt;/b&gt;: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Adresse priv.:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Mail Adresse: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Tel. priv.: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax priv.: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Handy priv.: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Web priv.: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Web gesch.: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Büro: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
-        <translation>Tel. gesch.: </translation>
+        <translation>Gesch.Tel.: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
-        <translation>Fax gesch.: </translation>
+        <translation>Gesch. Fax: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
-        <translation>Handy gesch.: </translation>
+        <translation>Gesch. Handy: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
-        <translation>Pieper gesch.: </translation>
+        <translation>Gesch. Pager:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Beruf: </translation>
     </message>
     <message>
         <source>Assistant: </source>
-        <translation>Assistent:</translation>
+        <translation>Assistent: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Vorgesetzter: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Männlich</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Weiblich</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Geschlecht: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Partner: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Geburtstag: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Jahrestag: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Spitzname: </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Titel</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Vorname</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Zweitname</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nachname</translation>
@@ -705,208 +704,205 @@ frei und versuchen Sie es noch einmal
     <message>
         <source>Home Zip</source>
         <translation>PLZ priv.</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Staat priv.</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Web priv.</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Partner</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Geschlecht</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Geburtstag</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Jahrestag</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Spitzname</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Kinder</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Gruppen</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Neues Dokument</translation>
     </message>
+    <message>
+        <source>Mon</source>
+        <translation>Mon</translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation>Die</translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation>Mit</translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation>Don</translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation>Fre</translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation>Sam</translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation>Son</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 Dokument</translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;Keine allgemeine Hilfe vorhanden- bitte benutzen Sie die kontextsensitve Hilfe:&lt;p&gt;Um kontextsensitive Hilfe zu verwenden: &lt;p&gt;&lt;ol&gt;&lt;li&gt;Klicken und halten Sie den Stift auf dem Hilfebutton.&lt;li&gt;Wenn die Titelzeile &lt;b&gt;What&apos;s this...&lt;/b&gt; anzeigt können Sie auf ein beliebiges Objekt klicken um die zugehörige Hilfe zu erhalten.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
-        <translation>Was ist das ?</translation>
+        <translation>Was ist das...</translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation>Klicken Sie hier, um das Fenster zu schliessen und alle Änderungen zu verwerfen.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation>Klicken Sie hier, um das Fenster zu schliessen.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation>Klicken Sie hier, um das Fenster zu schliessen und alle Änderungen zu akzeptieren.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation>Klicken Sie hier, um das Fenster verschiebbar zu machen.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation>Klicken sie hier, um das Fenster zu maximieren.</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF-Karte</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Festplatte</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD-Karte</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI Festplatte</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>interner Speicher</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>interner Hauptspeicher</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC-Karte</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Keine</translation>
     </message>
 </context>
 <context>
-    <name>TimeString</name>
-    <message>
-        <source>Mon</source>
-        <translation>Mon</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation>Die</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation>Mit</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation>Don</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation>Fre</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation>Sam</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation>Son</translation>
-    </message>
-</context>
-<context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>Citytime-Programm nicht gefunden</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Bitte installieren Sie opie-citytime 
 zur Einstellung der Zeitzonen.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Kein Speicher vorhanden</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Setzen des Alarms nicht möglich.
 Bitte machen Sie entsprechenden Speicher 
 frei und versuchen Sie es noch einmal
 .
 </translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 Dateien</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Alle %1-Dateien</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Alle Dateien</translation>
     </message>
 </context>
diff --git a/i18n/en/libqpe.ts b/i18n/en/libqpe.ts
index 5ee56fb..d2d61a4 100644
--- a/i18n/en/libqpe.ts
+++ b/i18n/en/libqpe.ts
@@ -690,204 +690,201 @@ Free some memory and try again.</source>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Document</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>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TimeString</name>
-    <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>
-</context>
-<context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libtodayaddressbookplugin.ts b/i18n/en/libtodayaddressbookplugin.ts
index 2f40ece..5c4bd5d 100644
--- a/i18n/en/libtodayaddressbookplugin.ts
+++ b/i18n/en/libtodayaddressbookplugin.ts
@@ -19,75 +19,78 @@
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>AddressBook plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AddressBookPluginWidget</name>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>AddressBook plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/libqpe.ts b/i18n/es/libqpe.ts
index 5f31bbf..f6b2229 100644
--- a/i18n/es/libqpe.ts
+++ b/i18n/es/libqpe.ts
@@ -700,206 +700,203 @@ Libere memoria e intételo de nuevo.</translation>
     <message>
         <source>Home Zip</source>
         <translation>Cód.portal casa</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>País casa</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Web personal</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Cónyuge</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Género</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Cumpleaños</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniversario</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Apodo</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Hijos</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Grupos</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Nuevo documento</translation>
     </message>
+    <message>
+        <source>Mon</source>
+        <translation type="unfinished">Lun</translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation type="unfinished">Mar</translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation type="unfinished">Mie</translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation type="unfinished">Jue</translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation type="unfinished">Vie</translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation type="unfinished">Sáb</translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation type="unfinished">Dom</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 documento</translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;No se dispone de ayuda exhaustiva para esta aplicación, sin embargo hay ayuda sensible al contexto.&lt;p&gt;Para usar esta ayuda:&lt;p&gt;&lt;ol&gt;&lt;li&gt;mantenga pulsado el botón de ayuda.&lt;li&gt;cuando la barra de título muestre &lt;b&gt;Qué es esto...&lt;/b&gt;, pulse en cualquier control.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Qué es esto...</translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation>Pulse para cerrar esta ventana, descartando los cambios.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation>Pulse para cerrar esta ventana.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation>Pulse para cerrar esta ventana y aplicar los cambios.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation>Pulse para hacer esta ventana móvil.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation>Pulse para hacer que esta ventana use toda la pantalla disponible.</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Tarjeta CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco duro</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Tarjeta SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Disco duro SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Almacenamiento interno</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Memoria interna</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>Tarjeta MMC</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Ninguno</translation>
     </message>
 </context>
 <context>
-    <name>TimeString</name>
-    <message>
-        <source>Mon</source>
-        <translation type="unfinished">Lun</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="unfinished">Mar</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="unfinished">Mie</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="unfinished">Jue</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="unfinished">Vie</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="unfinished">Sáb</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="unfinished">Dom</translation>
-    </message>
-</context>
-<context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>no encontré el ejecutable Reloj Mundial</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Para elegir las zonas horarias, por favor
 instale el Reloj Mundial (citytime).</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Incapaz de programar alarma.
 Libere memoria e inténtelo de nuevo</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 ficheros</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Todos los %1 ficheros</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Todos los ficheros</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libtodayaddressbookplugin.ts b/i18n/es/libtodayaddressbookplugin.ts
index 2f40ece..5c4bd5d 100644
--- a/i18n/es/libtodayaddressbookplugin.ts
+++ b/i18n/es/libtodayaddressbookplugin.ts
@@ -19,75 +19,78 @@
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>AddressBook plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AddressBookPluginWidget</name>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>AddressBook plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/libqpe.ts b/i18n/fr/libqpe.ts
index b686269..7475b92 100644
--- a/i18n/fr/libqpe.ts
+++ b/i18n/fr/libqpe.ts
@@ -701,206 +701,203 @@ Libérez de la mémoire et réessayez.</translation>
     <message>
         <source>Home Zip</source>
         <translation>Zip code (dom)</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Pays (dom)</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Page web (dom)</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Epouse</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Genre</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Date de naissance</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Anniversaire</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Surnom</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Enfants</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Groupes</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Nouveau document</translation>
     </message>
+    <message>
+        <source>Mon</source>
+        <translation type="unfinished">Lu</translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation type="unfinished">Ma</translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation type="unfinished">Me</translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation type="unfinished">Je</translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation type="unfinished">Ve</translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation type="unfinished">Sa</translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation type="unfinished">Di</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 document</translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;Aide globale n&apos;est pas disponible poyur cette application, cependant, il existe une aide contectuelle.&lt;p&gt; pour utiliser l&apos;aide contectuelle:&lt;p&gt;&lt;ol&gt;&lt;li&gt;Cliquez and maintenez sur le bouton d&apos;aide.&lt;li&gt;Lorsque la barre de titre affiche &lt;b&gt;qu&apos;est-ce-que c&apos;est...&lt;/b&gt;, cliquez sur n&apos;importe quel control.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Qu&apos;est ce que c&apos;est...</translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation>Cliquez pour fermer cette fenêtre et abandonner les changements.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation>Cliquez pour fermer cette fenêtre.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation>Cliquez pour fermer cette fenêtre et appliquer les changements.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation>Clqiuez pour rendre cette fenêtre déplaçable.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation>Cliquez pour que cette fenêtre remplisse l&apos;écran.</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Carte CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disque Dur</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Carte SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Disque Dur SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Stockage Interne</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Mémoire interne</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>Carte MMC</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Aucun</translation>
     </message>
 </context>
 <context>
-    <name>TimeString</name>
-    <message>
-        <source>Mon</source>
-        <translation>Lu</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation>Ma</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation>Me</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation>Je</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation>Ve</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation>Sa</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation>Di</translation>
-    </message>
-</context>
-<context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>Impossible de trouver l&apos;exécutable &quot;citytime&quot;</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Pour choisir le fueau horaire,
 installez &quot;citytime&quot; SVP.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Plus d&apos;espace</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Impossible de programmer une alarme.
 Libérez de la mémoire et réessayez</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 fichers</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>tous les %1 fichiers</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Tous les fichiers</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libtodayaddressbookplugin.ts b/i18n/fr/libtodayaddressbookplugin.ts
index e568a42..4b82617 100644
--- a/i18n/fr/libtodayaddressbookplugin.ts
+++ b/i18n/fr/libtodayaddressbookplugin.ts
@@ -20,75 +20,78 @@
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
         <translation>Pour activer les changement: Redémarrer l&apos;application!</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation>Définition des couleurs des titres:</translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation>Couleurs pour les titres!</translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>Cette couleur sera utilisée pour afficher les dates de Naissances/Anniversaire!</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished">Définir </translation>
     </message>
     <message>
         <source> days: </source>
         <translation>jours:</translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>AddressBook plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AddressBookPluginWidget</name>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>AddressBook plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/hu/libtodayaddressbookplugin.ts b/i18n/hu/libtodayaddressbookplugin.ts
index 2f40ece..5c4bd5d 100644
--- a/i18n/hu/libtodayaddressbookplugin.ts
+++ b/i18n/hu/libtodayaddressbookplugin.ts
@@ -19,75 +19,78 @@
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>AddressBook plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AddressBookPluginWidget</name>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>AddressBook plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/it/libqpe.ts b/i18n/it/libqpe.ts
index b611dd8..02c46e6 100644
--- a/i18n/it/libqpe.ts
+++ b/i18n/it/libqpe.ts
@@ -701,207 +701,204 @@ riprovare.</translation>
     <message>
         <source>Home Zip</source>
         <translation>CAP Abitazione</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Paese Abitazione</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Pagina Web Abitazione</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Coniuge</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sesso</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Compleanno</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Anniversario</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Alias</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Figli</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Gruppi</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Nuovo Documento</translation>
     </message>
+    <message>
+        <source>Mon</source>
+        <translation type="unfinished">Lun</translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation type="unfinished">Mar</translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation type="unfinished">Mer</translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation type="unfinished">Gio</translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation type="unfinished">Ven</translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation type="unfinished">Sab</translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation type="unfinished">Dom</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 documento</translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;La guida completa non è disponibile per questa applicazione, è comunque presente la guida base.&lt;p&gt;Per usare la guida:&lt;p&gt;&lt;ol&gt;&lt;li&gt;tieni premuto il tasto di aiuto.&lt;li&gt;quando apparirà &lt;b&gt;Cos&apos;è...&lt;/b&gt;, premi un qualunque tasto.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Cos&apos;è...</translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation>Premi per chiudere questa finestra, abbandonando le modifiche effettuate.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation>Premi per chiudere questa finestra.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation>Premi per chiudere questa finestra e salvare le modifiche effettuate.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation>Premi per spostare la finestra.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation>Premi per ingrandire al massimo questa finestra.</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Card CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Hard Disk</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Card SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Hard Disk SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Memoria Interna</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Memoria Interna</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>Card MMC</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Nessuna</translation>
     </message>
 </context>
 <context>
-    <name>TimeString</name>
-    <message>
-        <source>Mon</source>
-        <translation>Lun</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation>Mar</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation>Mer</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation>Gio</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation>Ven</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation>Sab</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation>Dom</translation>
-    </message>
-</context>
-<context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>eseguibile citytime non trovato</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Per scegliere il fuso orario,
 prego installare citytime.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Spazio Esaurito</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Impossibile programmare l&apos;allarme.
 Liberare dello spazio di memoria e
 riprovare</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 file</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Tutti i %1 file</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Tutti i file</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/libqpe.ts b/i18n/ja/libqpe.ts
index 777127f..202f527 100644
--- a/i18n/ja/libqpe.ts
+++ b/i18n/ja/libqpe.ts
@@ -690,204 +690,201 @@ Free some memory and try again.</source>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</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>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TimeString</name>
-    <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>
-</context>
-<context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/libtodayaddressbookplugin.ts b/i18n/ja/libtodayaddressbookplugin.ts
index 2f40ece..5c4bd5d 100644
--- a/i18n/ja/libtodayaddressbookplugin.ts
+++ b/i18n/ja/libtodayaddressbookplugin.ts
@@ -19,75 +19,78 @@
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>AddressBook plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AddressBookPluginWidget</name>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>AddressBook plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ko/libqpe.ts b/i18n/ko/libqpe.ts
index 777127f..202f527 100644
--- a/i18n/ko/libqpe.ts
+++ b/i18n/ko/libqpe.ts
@@ -690,204 +690,201 @@ Free some memory and try again.</source>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</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>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TimeString</name>
-    <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>
-</context>
-<context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/libtodayaddressbookplugin.ts b/i18n/ko/libtodayaddressbookplugin.ts
index 2f40ece..5c4bd5d 100644
--- a/i18n/ko/libtodayaddressbookplugin.ts
+++ b/i18n/ko/libtodayaddressbookplugin.ts
@@ -19,75 +19,78 @@
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>AddressBook plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AddressBookPluginWidget</name>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>AddressBook plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/no/libqpe.ts b/i18n/no/libqpe.ts
index 777127f..202f527 100644
--- a/i18n/no/libqpe.ts
+++ b/i18n/no/libqpe.ts
@@ -690,204 +690,201 @@ Free some memory and try again.</source>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</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>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TimeString</name>
-    <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>
-</context>
-<context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/libtodayaddressbookplugin.ts b/i18n/no/libtodayaddressbookplugin.ts
index 2f40ece..5c4bd5d 100644
--- a/i18n/no/libtodayaddressbookplugin.ts
+++ b/i18n/no/libtodayaddressbookplugin.ts
@@ -19,75 +19,78 @@
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>AddressBook plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AddressBookPluginWidget</name>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>AddressBook plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pl/libqpe.ts b/i18n/pl/libqpe.ts
index 4852c35..998aafe 100644
--- a/i18n/pl/libqpe.ts
+++ b/i18n/pl/libqpe.ts
@@ -700,205 +700,202 @@ Zwolnij wiecej pamieci</translation>
     <message>
         <source>Home Zip</source>
         <translation>Dom kod pocztowy</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Dom Panstwo&gt;</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Dom WWW</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>malzonek</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Plec</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Urodziny</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Rocznica</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Pseudonim</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Dzieci</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notatka</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Grupy</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mon</source>
+        <translation type="unfinished">Pon</translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation type="unfinished">Wto</translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation type="unfinished">Sro</translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation type="unfinished">Czw</translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation type="unfinished">Pia</translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation type="unfinished">Sob</translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation type="unfinished">Nie</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TimeString</name>
-    <message>
-        <source>Mon</source>
-        <translation type="unfinished">Pon</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="unfinished">Wto</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="unfinished">Sro</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="unfinished">Czw</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="unfinished">Pia</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="unfinished">Sob</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="unfinished">Nie</translation>
-    </message>
-</context>
-<context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Brak miejsca</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Nie moge ustawic alarmu.
 Zwolnij wiecej miejsca w pamieci</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libtodayaddressbookplugin.ts b/i18n/pl/libtodayaddressbookplugin.ts
index 2f40ece..5c4bd5d 100644
--- a/i18n/pl/libtodayaddressbookplugin.ts
+++ b/i18n/pl/libtodayaddressbookplugin.ts
@@ -19,75 +19,78 @@
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>AddressBook plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AddressBookPluginWidget</name>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>AddressBook plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/libqpe.ts b/i18n/pt/libqpe.ts
index 1ef915a..e3ae1bc 100644
--- a/i18n/pt/libqpe.ts
+++ b/i18n/pt/libqpe.ts
@@ -691,204 +691,201 @@ Free some memory and try again.</source>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished">Esposa</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Nascimento</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniversário</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Document</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mon</source>
+        <translation type="unfinished">Seg</translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation type="unfinished">Ter</translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation type="unfinished">Qua</translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation type="unfinished">Qui</translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation type="unfinished">Sex</translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation type="unfinished">Sáb</translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation type="unfinished">Dom</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Cartão CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Cartão SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Disco SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Armazenamento Interno</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TimeString</name>
-    <message>
-        <source>Mon</source>
-        <translation type="unfinished">Seg</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="unfinished">Ter</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="unfinished">Qua</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="unfinished">Qui</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="unfinished">Sex</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="unfinished">Sáb</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="unfinished">Dom</translation>
-    </message>
-</context>
-<context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Sem Espaço</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libtodayaddressbookplugin.ts b/i18n/pt/libtodayaddressbookplugin.ts
index 2f40ece..5c4bd5d 100644
--- a/i18n/pt/libtodayaddressbookplugin.ts
+++ b/i18n/pt/libtodayaddressbookplugin.ts
@@ -19,75 +19,78 @@
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>AddressBook plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AddressBookPluginWidget</name>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>AddressBook plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt_BR/libqpe.ts b/i18n/pt_BR/libqpe.ts
index 6843c1e..3afad2b 100644
--- a/i18n/pt_BR/libqpe.ts
+++ b/i18n/pt_BR/libqpe.ts
@@ -701,205 +701,202 @@ tente novamente.</translation>
     <message>
         <source>Home Zip</source>
         <translation>CEP Res</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>país Res</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Pág. Web Pessoal</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Esposo(a)</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sexo</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Aniversário</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniv. de Casamento</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Apelido</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Crianças</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Grupos</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mon</source>
+        <translation type="unfinished">Seg</translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation type="unfinished">Ter</translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation type="unfinished">Qua</translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation type="unfinished">Qui</translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation type="unfinished">Sex</translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation type="unfinished">Sab</translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation type="unfinished">Dom</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Disco Rígido SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Armazenamento Interno</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Cartão SD</translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation>Cartão CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco Rígido</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TimeString</name>
-    <message>
-        <source>Mon</source>
-        <translation type="unfinished">Seg</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="unfinished">Ter</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="unfinished">Qua</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="unfinished">Qui</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="unfinished">Sex</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="unfinished">Sab</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="unfinished">Dom</translation>
-    </message>
-</context>
-<context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Impossível agendar alarme.
 Por Favor libere algum espaço e tente novamente</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Sem Espaço</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libtodayaddressbookplugin.ts b/i18n/pt_BR/libtodayaddressbookplugin.ts
index 2f40ece..5c4bd5d 100644
--- a/i18n/pt_BR/libtodayaddressbookplugin.ts
+++ b/i18n/pt_BR/libtodayaddressbookplugin.ts
@@ -19,75 +19,78 @@
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>AddressBook plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AddressBookPluginWidget</name>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>AddressBook plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/libqpe.ts b/i18n/sl/libqpe.ts
index 60b6ae5..c3bf8d4 100644
--- a/i18n/sl/libqpe.ts
+++ b/i18n/sl/libqpe.ts
@@ -700,205 +700,202 @@ Sprostite nekaj spomina in poizkusite ponovno.</translation>
     <message>
         <source>Home Zip</source>
         <translation>Domača poštna številka</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Domača država</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Domača spletna stran</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Sopotnik</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Spol</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Rojstni dan</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Obletnica</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Vzdevek</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Otroci</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Zapiski</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Skupine</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mon</source>
+        <translation type="unfinished">Pon</translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation type="unfinished">Tor</translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation type="unfinished">Sre</translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation type="unfinished">Čet</translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation type="unfinished">Pet</translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation type="unfinished">Sob</translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation type="unfinished">Ned</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF kartica</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Trdi disk</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD kartica</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI trdi disk</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Notranja shramba</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TimeString</name>
-    <message>
-        <source>Mon</source>
-        <translation type="unfinished">Pon</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="unfinished">Tor</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="unfinished">Sre</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="unfinished">Čet</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="unfinished">Pet</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="unfinished">Sob</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="unfinished">Ned</translation>
-    </message>
-</context>
-<context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Zmanjkalo prostora</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Ne morem izvršiti alarma.
 Prosim sprostite malo prostora in poizkusite ponovno</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libtodayaddressbookplugin.ts b/i18n/sl/libtodayaddressbookplugin.ts
index 2f40ece..5c4bd5d 100644
--- a/i18n/sl/libtodayaddressbookplugin.ts
+++ b/i18n/sl/libtodayaddressbookplugin.ts
@@ -19,75 +19,78 @@
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>AddressBook plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AddressBookPluginWidget</name>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>AddressBook plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/xx/libqpe.ts b/i18n/xx/libqpe.ts
index 777127f..202f527 100644
--- a/i18n/xx/libqpe.ts
+++ b/i18n/xx/libqpe.ts
@@ -690,204 +690,201 @@ Free some memory and try again.</source>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</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>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TimeString</name>
-    <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>
-</context>
-<context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libtodayaddressbookplugin.ts b/i18n/xx/libtodayaddressbookplugin.ts
index 2f40ece..5c4bd5d 100644
--- a/i18n/xx/libtodayaddressbookplugin.ts
+++ b/i18n/xx/libtodayaddressbookplugin.ts
@@ -19,75 +19,78 @@
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>AddressBook plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AddressBookPluginWidget</name>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>AddressBook plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_CN/libqpe.ts b/i18n/zh_CN/libqpe.ts
index 777127f..202f527 100644
--- a/i18n/zh_CN/libqpe.ts
+++ b/i18n/zh_CN/libqpe.ts
@@ -690,204 +690,201 @@ Free some memory and try again.</source>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</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>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TimeString</name>
-    <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>
-</context>
-<context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libtodayaddressbookplugin.ts b/i18n/zh_CN/libtodayaddressbookplugin.ts
index 2f40ece..5c4bd5d 100644
--- a/i18n/zh_CN/libtodayaddressbookplugin.ts
+++ b/i18n/zh_CN/libtodayaddressbookplugin.ts
@@ -19,75 +19,78 @@
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>AddressBook plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AddressBookPluginWidget</name>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>AddressBook plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/libqpe.ts b/i18n/zh_TW/libqpe.ts
index df60785..1d9c1c0 100644
--- a/i18n/zh_TW/libqpe.ts
+++ b/i18n/zh_TW/libqpe.ts
@@ -700,206 +700,203 @@ Free some memory and try again.</source>
     <message>
         <source>Home Zip</source>
         <translation>住家 郵遞區號</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>住家 國家</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>個人網頁</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>配偶</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>性別</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>生日</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>周年紀念日</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>暱稱</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>子女</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>備註</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>群組</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>新增文件</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>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 文件</translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;QT&gt;泛用說明無法用於這個應用程式, 不過還有內容感應式說明.&lt;p&gt;要使用內容感應式說明:&lt;p&gt;&lt;ol&gt;&lt;li&gt;按住並停留在說明按鈕上.&lt;li&gt;當標題列顯示 &lt;b&gt;這是什麼...&lt;/b&gt; 時, 按一下任何控制元.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>這是什麼...</translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation>按這裡關閉這個視窗, 放棄所做的變更.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation>按這裡關閉視窗.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation>按這裡關閉視窗並接受所有的變更.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation>按這裡讓這個視窗可以移動.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation>按這裡讓這個視窗使用所有可用的螢幕區域.</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF 卡</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>硬碟</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD 卡</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI 硬碟</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>內部儲存空間</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>內部記憶體</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC 卡</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>無</translation>
     </message>
 </context>
 <context>
-    <name>TimeString</name>
-    <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>
-</context>
-<context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>找不到 城市時間 可執行檔</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>為了選擇時區,
 請安裝城市時間.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>空間不足</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>無法排程警示.
 請釋放空間後再試一次</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 檔案</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>全部 %1 個檔案</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>所有檔案</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libtodayaddressbookplugin.ts b/i18n/zh_TW/libtodayaddressbookplugin.ts
index 2f40ece..5c4bd5d 100644
--- a/i18n/zh_TW/libtodayaddressbookplugin.ts
+++ b/i18n/zh_TW/libtodayaddressbookplugin.ts
@@ -19,75 +19,78 @@
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>AddressBook plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AddressBookPluginWidget</name>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>AddressBook plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>