s/OFileDialog/Opie::Ui::OFileDialog

s/OFontSelector/Opie::Ui::OFontSelector

Update translation to namespace reality

36 files changed, 72 insertions, 72 deletions

diff --git a/i18n/cz/libopiepim2.ts b/i18n/cz/libopiepim2.ts
index 404611d..75847d1 100644
--- a/i18n/cz/libopiepim2.ts
+++ b/i18n/cz/libopiepim2.ts
@@ -1,944 +1,944 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Tlačítko Kalendář</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Tlačítko Kontakty</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Tlačítko Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Tlačítko Mail</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Tlačítko Domů</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Tlačítko záznam</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">otočení displeje</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Dolní+Nahoru</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Dolní+Dolů</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Dolní+Vpravo</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Dolní+Vlevo</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Horní+Nahoru</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Horní+Dolů</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Horní+Vpravo</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Horní+Vlevo</translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="obsolete">Tlačítko Akce</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="obsolete">Tlačítko OK</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="obsolete">Tlačítko Konec</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Odstín:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Saturace:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Hodnota:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Červená:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Zelená:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Modrá:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Alfa kanál:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Výběr barvy</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Více</translation>
     </message>
 </context>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="obsolete">FileDialog</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="obsolete">Otevřít</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="obsolete">Uložit</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Jméno:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Jméno</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Velikost</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">MIME typ</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Velký</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Střední</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Malý</translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="obsolete">Styl</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Velikost</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="obsolete">Příliš žluťoučký kůň úpěl ďábelské ódy</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Opakující se událost</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Žádný</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Týden</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Měsíc</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Rok</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Každý:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Frekvence</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Končit v:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Bez konečného data</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Opakovat v</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Úte</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Stř</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Čtv</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Pát</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Ned</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Každý</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Bez konečného data</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">dnů</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">den</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">týdnů</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">týden</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">měsíců</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">měsíc</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">let</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">rok</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">a</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">, a</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, a</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">v</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">bez opakování</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">dny</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Opakovat v</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Úte</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Stř</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Čtv</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Pát</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Ned</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">týdnů</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished">Opakovat dle</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished">měsíce</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished">roku</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Každý</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Opakující se událost</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Žádný</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Den</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Týden</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Měsíc</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Rok</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Každý:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Frekvence</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Končit v:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Bez konečného data</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Opakovat v</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Úte</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Stř</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Čtv</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Pát</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Ned</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Každý</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Bez konečného data</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">dnů</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">den</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">týdnů</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">týden</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">měsíců</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">měsíc</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">let</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">rok</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">a</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">, a</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, a</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">v</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">bez opakování</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">dny</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Opakovat v</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Úte</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Stř</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Čtv</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Pát</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Ned</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">týdnů</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Opakovat dle</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">dne</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">měsíce</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">roku</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Každý</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="obsolete">OTimePickerDialogBase</translation>
     </message>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Čas:</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Čas podání:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Dokumenty</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">Soubory</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="obsolete">Všechny soubory</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Popis:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Priorita:</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Velmi vysoká</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Vysoká</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normální</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Nízká</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Velmi nízká</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Postup:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Uzávěrka:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Výchozí Email:</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;br&gt;&lt;b&gt;Adresa zaměstnání:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Kancelář:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Webová stránka práce:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Telefon do práce:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax do práce:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Mobil do práce:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Pager do práce:</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;br&gt;&lt;b&gt;Adresa domů:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Domácí webová stránka:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Telefon domů:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax domů:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Soukromý mobil:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Všechny Emaily:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profese:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Asistent:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Vedoucí:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Muž</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Žena</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Pohlaví:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Manžel(ka):</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Narozeniny:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Výročí:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Děti:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Přezdívka:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Poznámky:</translation>
     </message>
     <message>
         <source>User Id</source>
         <translation>Uživatelské jméno</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Jméno</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Jméno</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Křestní jméno</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Příjmení</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>titul</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Soubor jako</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Název práce</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Oddělení</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Firma</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Telefon do práce</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax do práce</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Mobil do práce</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Výchozí Email</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Emaily</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Telefon domů</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax domů</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Soukromý mobil</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Ulice do práce</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Město do práce</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Stát do práce</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>PSČ do práce</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Země do práce</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Pager do práce</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Webová stránka práce</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kancelář</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Profese</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Asistent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Vedoucí</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Ulice domů</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Město domů</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Stát domů</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Domácí PSČ</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Domácí země</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Domácí webová stránka</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Manžel(ka)</translation>
     </message>
diff --git a/i18n/cz/libopieui2.ts b/i18n/cz/libopieui2.ts
index 0ca3287..0ffa57a 100644
--- a/i18n/cz/libopieui2.ts
+++ b/i18n/cz/libopieui2.ts
@@ -1,948 +1,948 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Tlačítko Kalendář</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Tlačítko Kontakty</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Tlačítko Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Tlačítko Mail</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Tlačítko Domů</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Tlačítko záznam</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">otočení displeje</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Dolní+Nahoru</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Dolní+Dolů</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Dolní+Vpravo</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Dolní+Vlevo</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Horní+Nahoru</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Horní+Dolů</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Horní+Vpravo</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Horní+Vlevo</translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="obsolete">Tlačítko Akce</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="obsolete">Tlačítko OK</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="obsolete">Tlačítko Konec</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Odstín:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Saturace:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Hodnota:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Červená:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Zelená:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Modrá:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Alfa kanál:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Výběr barvy</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Více</translation>
     </message>
 </context>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>FileDialog</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Otevřít</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Uložit</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Jméno:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Jméno</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Velikost</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">MIME typ</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Velký</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Střední</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Malý</translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation>Styl</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>Příliš žluťoučký kůň úpěl ďábelské ódy</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">Jméno</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Opakující se událost</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Žádný</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Den</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Týden</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Měsíc</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Rok</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Každý:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Frekvence</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Končit v:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Bez konečného data</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Opakovat v</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Úte</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Stř</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Čtv</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Pát</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Ned</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Každý</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Bez konečného data</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">dnů</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">den</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">týdnů</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">týden</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">měsíců</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">měsíc</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">let</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">rok</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">a</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">, a</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, a</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">v</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">bez opakování</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">dny</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Opakovat v</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Úte</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Stř</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Čtv</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Pát</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Ned</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">týdnů</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Opakovat dle</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">dne</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">měsíce</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">roku</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Každý</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation>OTimePickerDialogBase</translation>
     </message>
     <message>
         <source>Time:</source>
         <translation>Čas:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Čas podání:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Jméno</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Velikost</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">MIME typ</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Jméno:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">Jméno</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Jméno</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Velikost</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">MIME typ</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation>Dokumenty</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Soubory</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Všechny soubory</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="obsolete">Popis:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Priorita:</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="obsolete">Velmi vysoká</translation>
     </message>
     <message>
         <source>High</source>
         <translation type="obsolete">Vysoká</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">Normální</translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="obsolete">Nízká</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="obsolete">Velmi nízká</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Postup:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">Uzávěrka:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Kategorie:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="obsolete">Výchozí Email:</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;b&gt;Adresa zaměstnání:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">Kancelář:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">Webová stránka práce:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">Telefon do práce:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">Fax do práce:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">Mobil do práce:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">Pager do práce:</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;b&gt;Adresa domů:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">Domácí webová stránka:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">Telefon domů:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">Fax domů:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">Soukromý mobil:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="obsolete">Všechny Emaily:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="obsolete">Profese:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="obsolete">Asistent:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="obsolete">Vedoucí:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="obsolete">Muž</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="obsolete">Žena</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="obsolete">Pohlaví:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="obsolete">Manžel(ka):</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="obsolete">Narozeniny:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="obsolete">Výročí:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation type="obsolete">Děti:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation type="obsolete">Přezdívka:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="obsolete">Poznámky:</translation>
     </message>
     <message>
         <source>User Id</source>
         <translation type="obsolete">Uživatelské jméno</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Jméno</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Jméno</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="obsolete">Křestní jméno</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Příjmení</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="obsolete">titul</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Soubor jako</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="obsolete">Název práce</translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="obsolete">Oddělení</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Firma</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="obsolete">Telefon do práce</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="obsolete">Fax do práce</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="obsolete">Mobil do práce</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Výchozí Email</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">Emaily</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="obsolete">Telefon domů</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="obsolete">Fax domů</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="obsolete">Soukromý mobil</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="obsolete">Ulice do práce</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="obsolete">Město do práce</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="obsolete">Stát do práce</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="obsolete">PSČ do práce</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="obsolete">Země do práce</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="obsolete">Pager do práce</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="obsolete">Webová stránka práce</translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="obsolete">Kancelář</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="obsolete">Profese</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="obsolete">Asistent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="obsolete">Vedoucí</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="obsolete">Ulice domů</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="obsolete">Město domů</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="obsolete">Stát domů</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="obsolete">Domácí PSČ</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="obsolete">Domácí země</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="obsolete">Domácí webová stránka</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="obsolete">Manžel(ka)</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Pohlaví</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="obsolete">Narozeniny</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="obsolete">Výročí</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="obsolete">Přezdívka</translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="obsolete">Děti</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Poznámky</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="obsolete">Lokalita:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation type="obsolete">Toto je každodenní událost</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation type="obsolete">Toto je vícedenní událost</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation type="obsolete">Začátek:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation type="obsolete">Konec:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation type="obsolete">Poznámka:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Každý</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="obsolete">%1 %2 každý</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="obsolete">%1 každý</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation type="obsolete">%1 %2 každého</translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="obsolete">Každý</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="obsolete">Pondělí</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="obsolete">Úterý</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="obsolete">Středa</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="obsolete">Čtvrtek</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="obsolete">Pátek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="obsolete">Sobota</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="obsolete">Neděle</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Žádný</translation>
diff --git a/i18n/da/libopiepim2.ts b/i18n/da/libopiepim2.ts
index 8461c54..37cb611 100644
--- a/i18n/da/libopiepim2.ts
+++ b/i18n/da/libopiepim2.ts
@@ -1,880 +1,880 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Kalender-knap</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Kontakter-knap</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Menu-knap</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Post-knap</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Home-knap</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Optag-knap</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Roter skærmbillede</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Rød:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Grøn:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Blå:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Vælg farve</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Mere</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Mere...</translation>
     </message>
 </context>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>Open</source>
         <translation type="obsolete">Åbn</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="obsolete">Gem</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Navn:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Navn</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Størelse</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Dato</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Stor</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Mellem</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Lille</translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="obsolete">Stil</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Størrelse</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="obsolete">The Quick Brown Fox Jumps Over Lazy Dog</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Gentagende begivenhed</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Ingen</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Uge</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Måned</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">År</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Hver:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Hyppighed</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Afslut den:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Gentagelse aktiv</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>
     <message>
         <source>Every</source>
         <translation type="unfinished">Hver</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">dage</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">dag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">uger</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">uge</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">måneder</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">månede</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">år</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">år</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">og</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">,
 og</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, og</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">på</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">Ingen gentagelse</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">dag(e)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Gentagelse aktiv</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>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">uge(r)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished">Gentag efter</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Dag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Dato</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished">månede(r)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished">år</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Hver</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Gentagende begivenhed</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Ingen</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Uge</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Måned</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">År</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Hver:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Hyppighed</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Afslut den:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Ingen slut dato</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Gentagelse aktiv</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Man</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Tir</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Ons</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Tor</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Fre</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Lør</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Søn</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Hver</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Ingen slut-dato</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">dage</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">dag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">uger</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">uge</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">måneder</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">månede</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">år</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">år</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">og</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 og</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, og</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Ingen gentagelse</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">dag(e)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Gentagelse aktiv</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Man</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Tir</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Ons</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Tor</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Fre</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Lør</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Søn</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">uge(r)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Gentag efter</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Dato</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">månede(r)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">år</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Hver</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">på</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Tid:</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Vælg tid:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation type="unfinished">Beskrivelse:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioritet:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Deadline:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategori:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Standard email:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Kontor:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Arbejde hjemmeside:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Arbejde tlf:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Arbejde fax:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Arbejde mobil-tlf:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Forretning pager:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Privat hjemmeside:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Privat telefon:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Privat fax:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Privat mobil-tlf:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Alle email-adresser:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Stilling:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistent:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Leder:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Mand</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Kvinde</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Køn:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Ægtefælle:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Fødselsdag:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Bryllupsdag:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Børn:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notater:</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Start:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Slut:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Notat:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Hver</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 hver </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Den %1 hver</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Hver</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Mandag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Tirsdag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Onsdag</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Torsdag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Fredag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Lørdag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Søndag</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Dokumenter</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">Filer</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="obsolete">Alle filer</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Meget høj</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Høj</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Lav</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Meget lav</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Placering:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Hele dagen</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Flere dage</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Arbejds-adresse:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Hjemme-adresse:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>Den %1 %2 på hver</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business City</source>
diff --git a/i18n/da/libopieui2.ts b/i18n/da/libopieui2.ts
index ed78212..963aaf9 100644
--- a/i18n/da/libopieui2.ts
+++ b/i18n/da/libopieui2.ts
@@ -1,723 +1,723 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Kalender-knap</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Kontakter-knap</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Menu-knap</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Post-knap</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Home-knap</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Optag-knap</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Roter skærmbillede</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Rød:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Grøn:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Blå:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Vælg farve</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Mere</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Mere...</translation>
     </message>
 </context>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Åbn</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Gem</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Navn:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Navn</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Størelse</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Dato</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Stor</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Mellem</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Lille</translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation>Stil</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Størrelse</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>The Quick Brown Fox Jumps Over Lazy Dog</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">Navn</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Gentagende begivenhed</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Ingen</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Uge</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Måned</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">År</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Hver:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Hyppighed</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Afslut den:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Ingen slut dato</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Gentagelse aktiv</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Man</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Tir</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Ons</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Tor</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Fre</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Lør</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Søn</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Hver</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Ingen slut-dato</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">dage</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">dag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">uger</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">uge</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">måneder</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">månede</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">år</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">år</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">og</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 og</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, og</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Ingen gentagelse</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">dag(e)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Gentagelse aktiv</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Man</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Tir</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Ons</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Tor</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Fre</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Lør</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Søn</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">uge(r)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Gentag efter</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Dato</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">månede(r)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">år</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Hver</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">på</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Tid:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Vælg tid:</translation>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Navn</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Dato</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Navn:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">Navn</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Navn</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Dato</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation type="obsolete">Beskrivelse:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Prioritet:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">Deadline:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Kategori:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="obsolete">Standard email:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">Kontor:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">Arbejde hjemmeside:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">Arbejde tlf:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">Arbejde fax:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">Arbejde mobil-tlf:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">Forretning pager:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">Privat hjemmeside:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">Privat telefon:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">Privat fax:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">Privat mobil-tlf:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="obsolete">Alle email-adresser:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="obsolete">Stilling:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="obsolete">Assistent:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="obsolete">Leder:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="obsolete">Mand</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="obsolete">Kvinde</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="obsolete">Køn:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="obsolete">Ægtefælle:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="obsolete">Fødselsdag:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="obsolete">Bryllupsdag:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation type="obsolete">Børn:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="obsolete">Notater:</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation type="obsolete">Start:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation type="obsolete">Slut:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation type="obsolete">Notat:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Hver</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="obsolete">%1 %2 hver </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="obsolete">Den %1 hver</translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="obsolete">Hver</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="obsolete">Mandag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="obsolete">Tirsdag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="obsolete">Onsdag</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="obsolete">Torsdag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="obsolete">Fredag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="obsolete">Lørdag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="obsolete">Søndag</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumenter</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Filer</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Alle filer</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="obsolete">Meget høj</translation>
     </message>
     <message>
         <source>High</source>
         <translation type="obsolete">Høj</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="obsolete">Lav</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="obsolete">Meget lav</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="obsolete">Placering:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation type="obsolete">Hele dagen</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation type="obsolete">Flere dage</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Arbejds-adresse:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Hjemme-adresse:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation type="obsolete">Den %1 %2 på hver</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Ingen</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="obsolete">.</translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="obsolete">.</translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="obsolete">.</translation>
     </message>
     <message>
         <source>th</source>
         <translation type="obsolete">.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libopiepim2.ts b/i18n/de/libopiepim2.ts
index b439c3c..b4d83e4 100644
--- a/i18n/de/libopiepim2.ts
+++ b/i18n/de/libopiepim2.ts
@@ -1,937 +1,937 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Kalendarknopf</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Kontaktknopf</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Menüknopf</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Mailknopf</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Heimatknopf</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Aufnahmeknopf</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Bildschirm Rotierung</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Tiefgestellt+Hoch</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Tiefgestellt+Runter</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Tiefgestellt+Rechts</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Tiefgestellt+Links</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Hochgestellt +Hoch</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Hochgestellt +Runter</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Hochgestellt +Rechts</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Hochgestellt +Links</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Helligkeit:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Sättigung:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Wert:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Rot:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Grün:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Blau:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Alphakanal:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Farbe wählen</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Mehr</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Mehr...</translation>
     </message>
 </context>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="obsolete">Dateidialog</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="obsolete">Öffnen</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="obsolete">Speichern</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Name:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Größe</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Dateityp</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Groß</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Mittel</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Klein</translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="obsolete">Stil</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Größe</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="obsolete">Falsches Üben von Xylophonmusik quält jeden größeren Zwerg</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Wiederholendes Ereignis</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Keines</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Tag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Woche</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Monat</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Jahr</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Jeden:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Häufigkeit</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Endet am:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Kein Enddatum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Wiederholung an</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Mon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Mi</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Fr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">So</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Jeden</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Kein Enddatum</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">Tage</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">Tag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">Wochen</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">Woche</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">Monate</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">Monat</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">Jahre</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">Jahr</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">und </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">,
 und</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, and</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">an</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">Keine Wiederholung</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">Tag(e)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Wiederholung an</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Mon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Mi</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Fr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">So</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">Woche(n)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished">Wiederholen bis</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Tag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished">Monat(e)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished">Jahr(e)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Jeden</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Wiederholendes Ereignis</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Keines</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Tag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Woche</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Monat</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Jahr</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Jeden:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Häufigkeit</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Endet am:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Kein Enddatum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Wiederholung an</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Mon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mi</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Fr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">So</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Jeden</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Kein Enddatum</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">Tage</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">Tag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">Wochen</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">Woche</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">Monate</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">Monat</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">Jahre</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">Jahr</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">und </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 und</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, and</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Keine Wiederholung</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">Tag(e)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Wiederholung an</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Mon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mi</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Fr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">So</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">Woche(n)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Wiederholen bis</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Tag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">Monat(e)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">Jahr(e)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Jeden</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">an</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Zeit:</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Zeit auswählen:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation type="unfinished">Beschreibung:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Priorität:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Fortschritt:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Fälligkeit:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Stand. EMail: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Arbeitsadresse:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Büro: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Geschäftswebseiten: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Geschäftstelefon:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Geschäftsfax: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Geschäftshandy: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Geschäftspiepser: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Privatadresse:&lt;/b&gt; </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Private Webseiten: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Privates Telefon: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Privates Fax: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Privates Handy: </translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Alle Emails: </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>Male</source>
         <translation>Mann</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Frau</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Geschlecht:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Ehepartner: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Geburtstag: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Jahrestag: </translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Kinder: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Spitzname: </translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notizen:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Jeden</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 jeden</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Den %1 jeden</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="obsolete">Den %1 %1 of jeden</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Jeden </translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Montag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Dienstag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mittwoch</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Donnerstag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Freitag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Samstag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Sonntag</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Start:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Ende:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Notiz:</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Dokumente</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">Dateien</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="obsolete">All Dateien</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Sehr hoch</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Hoch</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Niedrig</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Sehr niedrig</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Ort:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Das ist ein Termin ohne Zeit</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Das ist ein mehrtägiger Termin</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Arbeitsadresse:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Privatadresse:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>Den %1 %2 jedes</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
diff --git a/i18n/de/libopieui2.ts b/i18n/de/libopieui2.ts
index 4e976cc..275afd1 100644
--- a/i18n/de/libopieui2.ts
+++ b/i18n/de/libopieui2.ts
@@ -1,816 +1,816 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Kalendarknopf</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Kontaktknopf</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Menüknopf</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Mailknopf</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Heimatknopf</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Aufnahmeknopf</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Bildschirm Rotierung</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Tiefgestellt+Hoch</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Tiefgestellt+Runter</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Tiefgestellt+Rechts</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Tiefgestellt+Links</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Hochgestellt +Hoch</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Hochgestellt +Runter</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Hochgestellt +Rechts</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Hochgestellt +Links</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Helligkeit:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Sättigung:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Wert:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Rot:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Grün:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Blau:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Alphakanal:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Farbe wählen</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Mehr</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Mehr...</translation>
     </message>
 </context>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Name:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Größe</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Dateityp</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Groß</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Mittel</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Klein</translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation>Stil</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>Falsches Üben von Xylophonmusik quält jeden größeren Zwerg</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">Name</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Wiederholendes Ereignis</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Keines</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Tag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Woche</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Monat</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Jahr</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Jeden:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Häufigkeit</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Endet am:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Kein Enddatum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Wiederholung an</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Mon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mi</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Fr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">So</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Jeden</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Kein Enddatum</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">Tage</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">Tag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">Wochen</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">Woche</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">Monate</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">Monat</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">Jahre</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">Jahr</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">und </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 und</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, and</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Keine Wiederholung</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">Tag(e)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Wiederholung an</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Mon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mi</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Fr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">So</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">Woche(n)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Wiederholen bis</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Tag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">Monat(e)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">Jahr(e)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Jeden</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">an</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Zeit:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Zeit auswählen:</translation>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Größe</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Dateityp</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Name:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Größe</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Dateityp</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation type="obsolete">Beschreibung:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Priorität:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Fortschritt:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">Fälligkeit:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Kategorie:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="obsolete">Stand. EMail: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Arbeitsadresse:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">Büro: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">Geschäftswebseiten: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">Geschäftstelefon:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">Geschäftsfax: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">Geschäftshandy: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">Geschäftspiepser: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Privatadresse:&lt;/b&gt; </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">Private Webseiten: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">Privates Telefon: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">Privates Fax: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">Privates Handy: </translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="obsolete">Alle Emails: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="obsolete">Beruf: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="obsolete">Assistent: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="obsolete">Manager: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="obsolete">Mann</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="obsolete">Frau</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="obsolete">Geschlecht:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="obsolete">Ehepartner: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="obsolete">Geburtstag: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="obsolete">Jahrestag: </translation>
     </message>
     <message>
         <source>Children: </source>
         <translation type="obsolete">Kinder: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation type="obsolete">Spitzname: </translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="obsolete">Notizen:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Jeden</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="obsolete">%1 %2 jeden</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="obsolete">Den %1 jeden</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="obsolete">Den %1 %1 of jeden</translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="obsolete">Jeden </translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="obsolete">Montag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="obsolete">Dienstag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="obsolete">Mittwoch</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="obsolete">Donnerstag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="obsolete">Freitag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="obsolete">Samstag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="obsolete">Sonntag</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation type="obsolete">Start:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation type="obsolete">Ende:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation type="obsolete">Notiz:</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumente</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Dateien</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>All Dateien</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="obsolete">Sehr hoch</translation>
     </message>
     <message>
         <source>High</source>
         <translation type="obsolete">Hoch</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="obsolete">Niedrig</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="obsolete">Sehr niedrig</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="obsolete">Ort:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation type="obsolete">Das ist ein Termin ohne Zeit</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation type="obsolete">Das ist ein mehrtägiger Termin</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Arbeitsadresse:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Privatadresse:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation type="obsolete">Den %1 %2 jedes</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Keines</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="obsolete">st</translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="obsolete">nd</translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="obsolete">rd</translation>
     </message>
     <message>
         <source>th</source>
         <translation type="obsolete">th</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/dk/libopieui2.ts b/i18n/dk/libopieui2.ts
index 51a5983..a40cb08 100644
--- a/i18n/dk/libopieui2.ts
+++ b/i18n/dk/libopieui2.ts
@@ -1,175 +1,175 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libopieui2.ts b/i18n/en/libopieui2.ts
index 0f61518..d311189 100644
--- a/i18n/en/libopieui2.ts
+++ b/i18n/en/libopieui2.ts
@@ -1,175 +1,175 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libopiepim2.ts b/i18n/es/libopiepim2.ts
index 1af73b4..57b1583 100644
--- a/i18n/es/libopiepim2.ts
+++ b/i18n/es/libopiepim2.ts
@@ -1,936 +1,936 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Botón Calendario</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Botón Contactos</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Botón Menú</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Botón Correo</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Botón Inicio</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Botón Grabación</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Rotación de la pantalla</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Minúscula+Arriba</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Minúscula+Abajo</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Minúscula+Derecha</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Minúscula+Izquierda</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Mayúscula+Arriba</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Mayúscula+Abajo</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Mayúscula+Derecha</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Mayúscula+Izquierda</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Tono:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Saturación:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Valor:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Rojo:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Azul:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Canal alfa:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Seleccione color</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Más</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Más...</translation>
     </message>
 </context>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="obsolete">Diálogo Fichero</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="obsolete">Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="obsolete">Guardar</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nombre:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nombre</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Tamaño</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Fecha</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Mediana</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Pequeña</translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="obsolete">Estilo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Tamaño</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="obsolete">El Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Cita repetitiva </translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Ninguno</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Día</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Mes</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Año</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Cada:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Frecuencia</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Finalizar el:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Sin fecha final</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Repetir el</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>
     <message>
         <source>Every</source>
         <translation type="unfinished">Cada</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">VarSemana</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Sin fecha final</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">días</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">día</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">meses</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">mes</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">años</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">año</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"> y </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">,
 y </translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, y </translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">en </translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">No repetir</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">día(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Repetir el</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>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished">Repetir cada</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Día</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Fecha</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished">mese(s)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished">año(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Cada</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Cita repetitiva </translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Ninguno</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Día</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Mes</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Año</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Cada:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Frecuencia</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Finalizar el:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sin fecha final</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repetir el</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mie</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Jue</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Vie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Cada</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">VarSemana</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sin fecha final</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">días</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">día</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">meses</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">mes</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">años</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">año</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete"> y </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 y </translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, y </translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">No repetir</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">día(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repetir el</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mie</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Jue</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Vie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Repetir cada</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Día</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Fecha</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">mese(s)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">año(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Cada</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">en </translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Hora:</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Tomar hora:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Documentos</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">Ficheros</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="obsolete">Todos los ficheros</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioridad:</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Muy alta</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Alta</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Baja</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Muy baja</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Progreso:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Fecha lí­mite:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Correo-e preferido: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Oficina: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Web trabajo: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Teléfono trabajo: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax trabajo: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Móvil trabajo: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Busca trabajo: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Página web personal: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Teléfono casa: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax casa: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Móvil personal: </translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Todos correos-e: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profesión: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Ayudante: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Superior: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Hombre</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Mujer</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Género: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Cónyuge: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Cumpleaños: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Aniversario: </translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Hijos: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Apodo: </translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas: </translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Localidad: </translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Esta cita dura todo el día</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Esta cita dura varios días</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Inicio:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Final:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Nota:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Cada</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 cada </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>El %1 cada </translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Cada </translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lunes</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Martes</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Miércoles</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Jueves</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Viernes</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Dirección trabajo:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Dirección casa:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>El %1 %2 de cada</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
diff --git a/i18n/es/libopieui2.ts b/i18n/es/libopieui2.ts
index b369e56..e3c754f 100644
--- a/i18n/es/libopieui2.ts
+++ b/i18n/es/libopieui2.ts
@@ -1,799 +1,799 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Botón Calendario</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Botón Contactos</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Botón Menú</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Botón Correo</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Botón Inicio</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Botón Grabación</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Rotación de la pantalla</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Minúscula+Arriba</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Minúscula+Abajo</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Minúscula+Derecha</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Minúscula+Izquierda</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Mayúscula+Arriba</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Mayúscula+Abajo</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Mayúscula+Derecha</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Mayúscula+Izquierda</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Tono:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Saturación:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Valor:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Rojo:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Azul:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Canal alfa:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Seleccione color</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Más</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Más...</translation>
     </message>
 </context>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>Diálogo Fichero</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nombre:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nombre</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Tamaño</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Fecha</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Mediana</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Pequeña</translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation>Estilo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>El Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">Nombre</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Cita repetitiva </translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Ninguno</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Día</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Mes</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Año</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Cada:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Frecuencia</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Finalizar el:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sin fecha final</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repetir el</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mie</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Jue</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Vie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Cada</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">VarSemana</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sin fecha final</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">días</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">día</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">meses</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">mes</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">años</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">año</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete"> y </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 y </translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, y </translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">No repetir</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">día(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repetir el</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mie</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Jue</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Vie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Repetir cada</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Día</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Fecha</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">mese(s)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">año(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Cada</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">en </translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Hora:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Tomar hora:</translation>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Nombre</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Tamaño</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Fecha</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Tipo mime</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Nombre:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">Nombre</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nombre</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Tamaño</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Fecha</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo mime</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Ficheros</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Todos los ficheros</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Prioridad:</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="obsolete">Muy alta</translation>
     </message>
     <message>
         <source>High</source>
         <translation type="obsolete">Alta</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="obsolete">Baja</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="obsolete">Muy baja</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Progreso:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">Fecha lí­mite:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Categoría:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="obsolete">Correo-e preferido: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">Oficina: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">Web trabajo: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">Teléfono trabajo: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">Fax trabajo: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">Móvil trabajo: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">Busca trabajo: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">Página web personal: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">Teléfono casa: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">Fax casa: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">Móvil personal: </translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="obsolete">Todos correos-e: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="obsolete">Profesión: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="obsolete">Ayudante: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="obsolete">Superior: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="obsolete">Hombre</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="obsolete">Mujer</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="obsolete">Género: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="obsolete">Cónyuge: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="obsolete">Cumpleaños: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="obsolete">Aniversario: </translation>
     </message>
     <message>
         <source>Children: </source>
         <translation type="obsolete">Hijos: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation type="obsolete">Apodo: </translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="obsolete">Notas: </translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="obsolete">Localidad: </translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation type="obsolete">Esta cita dura todo el día</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation type="obsolete">Esta cita dura varios días</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation type="obsolete">Inicio:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation type="obsolete">Final:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation type="obsolete">Nota:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Cada</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="obsolete">%1 %2 cada </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="obsolete">El %1 cada </translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="obsolete">Cada </translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="obsolete">Lunes</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="obsolete">Martes</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="obsolete">Miércoles</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="obsolete">Jueves</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="obsolete">Viernes</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="obsolete">Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="obsolete">Domingo</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Dirección trabajo:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Dirección casa:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation type="obsolete">El %1 %2 de cada</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Ninguno</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="obsolete">º</translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="obsolete">º</translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="obsolete">º</translation>
     </message>
     <message>
         <source>th</source>
         <translation type="obsolete">º</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libopiepim2.ts b/i18n/fr/libopiepim2.ts
index 8b14b1b..57d626d 100644
--- a/i18n/fr/libopiepim2.ts
+++ b/i18n/fr/libopiepim2.ts
@@ -1,949 +1,949 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Bouton Agenda</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Bouton Contacts</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Bouton Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Bouton E-mail</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Bouton Bureau</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Bouton Enregistrement</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Rotation écran</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Haut</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Bas</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Droite</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Gauche</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Maj-Haut</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Maj-Bas</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Maj-Droite</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Maj-Gauche</translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="obsolete">Bouton Action</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="obsolete">Bouton OK</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="obsolete">Bouton Fin</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Nuance:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Sat : </translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Val : </translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Rouge : </translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Vert : </translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Bleu : </translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Canal alpha : </translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Sélectionner couleur</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Ajouter</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Ajouter...</translation>
     </message>
 </context>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="obsolete">Sélection fichier</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="obsolete">Ouvrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="obsolete">Enregistrer</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nom : </translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nom</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Taille</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Date</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Type mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Moyenne</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Petite</translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="obsolete">Style</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Taille</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="obsolete">Le renard brun saute au dessus du chien paresseux</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Répétition</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Aucune</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Jour</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semaine</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mois</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Année</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Chaque : </translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Fréquence</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Fin : </translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Pas de date de fin</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Répéter</translation>
     </message>
     <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>
     <message>
         <source>Every</source>
         <translation>Chaque </translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation>Pas de date de fin</translation>
     </message>
     <message>
         <source>days</source>
         <translation>jours</translation>
     </message>
     <message>
         <source>day</source>
         <translation>jour</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>semaines</translation>
     </message>
     <message>
         <source>week</source>
         <translation>semaine</translation>
     </message>
     <message>
         <source>months</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>years</source>
         <translation>années</translation>
     </message>
     <message>
         <source>year</source>
         <translation>année</translation>
     </message>
     <message>
         <source> and </source>
         <translation> et </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 et </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, et </translation>
     </message>
     <message>
         <source>on </source>
         <translation>Les </translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation>Pas de répétition</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>jour(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Répéter</translation>
     </message>
     <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>
     <message>
         <source>week(s)</source>
         <translation>semaine(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Type répétition</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Jour</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>année(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Chaque </translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Répétition</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Aucune</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Jour</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Semaine</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Mois</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Année</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Chaque : </translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Fréquence</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Fin : </translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sans</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Répéter</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lu</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ma</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Me</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Je</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Ve</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Di</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Chaque </translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">A l&apos;infini</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">jours</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">jour</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">semaines</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">semaine</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">mois</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">mois</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">années</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">année</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete"> et </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 et </translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, et </translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">Les </translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Pas de répétition</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">jour(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Répéter</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lu</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ma</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Me</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Je</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Ve</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Di</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">semaine(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Type répétition</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Jour</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Date</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">mois</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">année(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Chaque </translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Heure : </translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Choisir heure : </translation>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="obsolete">OTimePickerDialogBase</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Documents</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">Fichiers</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="obsolete">Tous fichiers</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notes : </translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Priorité : </translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Très haute</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Haute</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normale</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Faible</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Très faible</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Etat : </translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Délai : </translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Catégorie : </translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>E-mail par défaut : </translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Adresse (bur):&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Service : </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Page Web (bur.):</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Tél (bur.):</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax (bur.):</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Mobile (bur.):</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Alphapage (bur.):</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Adresse (dom.):&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Page Web (bur.):</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Téléphone (dom.):</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax (dom.):</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Mobile (perso.):</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>E-mail(s) : </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profession : </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistant(e) : </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Responsable : </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Homme</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Femme</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Type : </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Conjoint : </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Date de naissance : </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Anniversaire : </translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Enfant(s) : </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Surnom : </translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lieu : </translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Cet événement couvre
 toute la journée</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Cet événement couvre
 plusieurs jours</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Début : </translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Fin : </translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Note : </translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Chaque </translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 chaque</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Le %1 chaque</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>Le %2 %1 chaque </translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Chaque</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lundi</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Mardi</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mercredi</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Jeudi</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Vendredi</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Samedi</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Dimanche</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Description : </translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;br&gt;&lt;b&gt;Adresse (bur.): &lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;br&gt;&lt;b&gt;Adresse (dom.): &lt;/b&gt;</translation>
     </message>
     <message>
         <source>User Id</source>
         <translation>Id utilisateur</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Catégories</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Titre</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Prénom</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>2nd Prénom</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffixe</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Classer sous</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Fonction</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Département</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Société</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Téléphone (bur.)</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax (bur.)</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Mobile (bur.)</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>E-mail (défaut)</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>E-mails</translation>
     </message>
diff --git a/i18n/fr/libopieui2.ts b/i18n/fr/libopieui2.ts
index ed55ce6..eca489b 100644
--- a/i18n/fr/libopieui2.ts
+++ b/i18n/fr/libopieui2.ts
@@ -1,953 +1,953 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Bouton Agenda</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Bouton Contacts</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Bouton Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Bouton E-mail</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Bouton Bureau</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Bouton Enregistrement</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Rotation écran</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Haut</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Bas</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Droite</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Gauche</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Maj-Haut</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Maj-Bas</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Maj-Droite</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Maj-Gauche</translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="obsolete">Bouton Action</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="obsolete">Bouton OK</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="obsolete">Bouton Fin</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Nuance:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Sat : </translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Val : </translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Rouge : </translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Vert : </translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Bleu : </translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Canal alpha : </translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Sélectionner couleur</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Ajouter</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Ajouter...</translation>
     </message>
 </context>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>Sélection fichier</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Enregistrer</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nom : </translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nom</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Taille</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Date</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Type mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Moyenne</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Petite</translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation>Style</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>Le renard brun saute au dessus du chien paresseux</translation>
     </message>
 </context>
 <context>
     <name>OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="obsolete">Configurer clé</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="obsolete">Dessin</translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">Nom</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="obsolete">Touche</translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="obsolete">Touche par défaut</translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="obsolete">Raccourci pour l&apos;action séléctionnée</translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="obsolete">&amp;Aucun</translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="obsolete">&amp;Défaut</translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="obsolete">&amp;Personnalisé</translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="obsolete">Configurer touche</translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="obsolete">Défaut : </translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="obsolete">La touche est dans la liste noire</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;La touche que vous avez sélectionnée est dans la liste noire et ne devrait pas être utilisée avec ce gestionnaire. Veuillez utiliser une touche différente.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="obsolete">Touche déjà assignée</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;La touche que vous avez sélectionnée est déjà utilisée pour un autre élément de votre configuration. Veuillez utiliser une autre touche.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Répétition</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Aucune</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Jour</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Semaine</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Mois</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Année</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Chaque : </translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Fréquence</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Fin : </translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sans</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Répéter</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lu</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ma</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Me</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Je</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Ve</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Di</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Chaque </translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">A l&apos;infini</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">jours</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">jour</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">semaines</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">semaine</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">mois</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">mois</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">années</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">année</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete"> et </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 et </translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, et </translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">Les </translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Pas de répétition</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">jour(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Répéter</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lu</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ma</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Me</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Je</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Ve</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Di</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">semaine(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Type répétition</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Jour</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Date</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">mois</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">année(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Chaque </translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Heure : </translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Choisir heure : </translation>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation>OTimePickerDialogBase</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Nom</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Taille</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Date</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Type mime</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation>Nom : </translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished">Dessin</translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">Nom</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished">Touche</translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished">Touche par défaut</translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished">Raccourci pour l&apos;action séléctionnée</translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished">&amp;Aucun</translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished">&amp;Défaut</translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished">&amp;Personnalisé</translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished">Défaut : </translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished">La touche est dans la liste noire</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished">&lt;qt&gt;La touche que vous avez sélectionnée est dans la liste noire et ne devrait pas être utilisée avec ce gestionnaire. Veuillez utiliser une touche différente.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished">Touche déjà assignée</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished">&lt;qt&gt;La touche que vous avez sélectionnée est déjà utilisée pour un autre élément de votre configuration. Veuillez utiliser une autre touche.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nom</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Taille</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Date</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Type mime</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation>Documents</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Fichiers</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Tous fichiers</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="obsolete">Notes : </translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Priorité : </translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="obsolete">Très haute</translation>
     </message>
     <message>
         <source>High</source>
         <translation type="obsolete">Haute</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">Normale</translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="obsolete">Faible</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="obsolete">Très faible</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Etat : </translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">Délai : </translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Catégorie : </translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="obsolete">E-mail par défaut : </translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Adresse (bur):&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">Service : </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">Page Web (bur.):</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">Tél (bur.):</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">Fax (bur.):</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">Mobile (bur.):</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">Alphapage (bur.):</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Adresse (dom.):&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">Page Web (bur.):</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">Téléphone (dom.):</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">Fax (dom.):</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">Mobile (perso.):</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="obsolete">E-mail(s) : </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="obsolete">Profession : </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="obsolete">Assistant(e) : </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="obsolete">Responsable : </translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="obsolete">Homme</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="obsolete">Femme</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="obsolete">Type : </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="obsolete">Conjoint : </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="obsolete">Date de naissance : </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="obsolete">Anniversaire : </translation>
     </message>
     <message>
         <source>Children: </source>
         <translation type="obsolete">Enfant(s) : </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation type="obsolete">Surnom : </translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="obsolete">Lieu : </translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation type="obsolete">Cet événement couvre
 toute la journée</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation type="obsolete">Cet événement couvre
 plusieurs jours</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation type="obsolete">Début : </translation>
     </message>
     <message>
         <source>End:</source>
         <translation type="obsolete">Fin : </translation>
     </message>
     <message>
         <source>Note:</source>
         <translation type="obsolete">Note : </translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Chaque </translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="obsolete">%1 %2 chaque</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="obsolete">Le %1 chaque</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation type="obsolete">Le %2 %1 chaque </translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="obsolete">Chaque</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="obsolete">Lundi</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="obsolete">Mardi</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="obsolete">Mercredi</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="obsolete">Jeudi</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="obsolete">Vendredi</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="obsolete">Samedi</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="obsolete">Dimanche</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="obsolete">Description : </translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;b&gt;Adresse (bur.): &lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;b&gt;Adresse (dom.): &lt;/b&gt;</translation>
     </message>
     <message>
         <source>User Id</source>
         <translation type="obsolete">Id utilisateur</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="obsolete">Catégories</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Titre</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Prénom</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="obsolete">2nd Prénom</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Nom</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="obsolete">Suffixe</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Classer sous</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="obsolete">Fonction</translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="obsolete">Département</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Société</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="obsolete">Téléphone (bur.)</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="obsolete">Fax (bur.)</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="obsolete">Mobile (bur.)</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">E-mail (défaut)</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">E-mails</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="obsolete">Téléphone (dom.)</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="obsolete">Fax (dom.)</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="obsolete">Mobile (perso.)</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="obsolete">Adresse (bur.)</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="obsolete">Ville (bur.)</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="obsolete">Département (bur.)</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="obsolete">Code Postal (bur.)</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="obsolete">Pays (bur.)</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="obsolete">Alphapage (bur.)</translation>
     </message>
     <message>
diff --git a/i18n/hu/libopieui2.ts b/i18n/hu/libopieui2.ts
index 96b23f6..d3a67c3 100644
--- a/i18n/hu/libopieui2.ts
+++ b/i18n/hu/libopieui2.ts
@@ -1,317 +1,317 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Ismétlődő esemény</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Nincs</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Nap</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Hét</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Hónap</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Év</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Minden:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Gyakoriság</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Vége:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Nincs végső dátum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Ismétlés</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Hé</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ke</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Sze</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Csü</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Pé</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Szo</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Va</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Minden</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">HétVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Nincs végső dátum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Ismétlés</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Hé</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ke</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Sze</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Csü</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Pé</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Szo</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Va</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Nap</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Minden</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Idő:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Válasszon időt:</translation>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Every</source>
         <translation type="obsolete">Minden</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Nincs</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libopiepim2.ts b/i18n/it/libopiepim2.ts
index af5f4fa..e099ecf 100644
--- a/i18n/it/libopiepim2.ts
+++ b/i18n/it/libopiepim2.ts
@@ -1,937 +1,937 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Pulsante Agenda</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Pulsante ontatti</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Pulsante Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Pulsante Posta</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Pulsante Home</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Pulsante Registrazione</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Rotazione Display</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Basso+Sù</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Basso+Giù</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Basso+Destra</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Basso+Sinistra</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Alto+Sù</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Alto+Giù</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Alto+Destra</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Alto+Sinistra</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Tinta:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Sat:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Val:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Rosso:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Blu:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Alpha channel:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Seleziona colore</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Ancora</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Ancora...</translation>
     </message>
 </context>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="obsolete">FileDialog</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="obsolete">Apri</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="obsolete">Salva</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nome:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Dimensione</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo Mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Medio</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Piccolo</translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="obsolete">Stile</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Dimensione</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="obsolete">Cantami o Diva del pelide Achille l&apos;ira funesta</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Evento Ripetuto</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Nessuno</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Giorno</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Settimana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Mese</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Anno</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Ogni:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Frequenza</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Fine Il:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Indefinitivamente</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></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>
     <message>
         <source>Every</source>
         <translation type="unfinished">Ogni</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Indefinitivamente</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">giorni</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">giorno</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">settimane</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">settimana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">mesi</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">mese</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">anni</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">anno</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">e</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">,
 e </translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, e </translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">su</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">Mai</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">giorno(i)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></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>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">settimana(e)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished">Ripeti Per</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Giorno</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished">mese(i)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished">anno(i)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Ogni</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Evento Ripetuto</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Nessuno</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Giorno</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Settimana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Mese</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Anno</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Ogni:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Frequenza</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Fine Il:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Indefinitivamente</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Ripeti Su</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mer</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Gio</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Ven</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Ogni</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Indefinitivamente</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">giorni</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">giorno</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">settimane</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">settimana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">mesi</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">mese</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">anni</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">anno</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">e</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 e </translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, e </translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Mai</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">giorno(i)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Ripeti Il</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mer</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Gio</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Ven</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">settimana(e)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Ripeti Per</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Giorno</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">mese(i)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">anno(i)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Ogni</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">su</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Orario:</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Scegli l&apos;Orario:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation type="unfinished">Descrizione:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Priorità:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Avanzamento:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Scadenza:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Indirizzo Ufficio:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Indirizzo Casa:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Telefono Casa: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax Casa: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Cellulare Casa: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Pagina Web Casa: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Pagina Web Ufficio: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Ufficio: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Telefono Ufficio: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax Ufficio: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Cellulare Ufficio: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Cercapersone Ufficio: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Professione: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistente: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Direttore: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Maschile</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Femminile</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Sesso: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Coniuge: </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>Default Email: </source>
         <translation>Email Principale: </translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Tutte le Email: </translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Figli: </translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Note:</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Inizio:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Fine:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Nota:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Ogni</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 ogni </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Il %1 ogni </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="obsolete">Il %1 %1 di ogni</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Ogni </translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lunedì</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Martedì</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mercoledì</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Giovedì</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Venerdì</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sabato</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domenica</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Documenti</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">File</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="obsolete">Tutti i File</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Molto alta</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Alta</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normale</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Bassa</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Molto bassa</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Ubicazione:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Evento per tutto il giorno</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Evento per molti giorni</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Indirizzo Ufficio:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Indirizzo Casa:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>Il %1 %2 di ogni</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
diff --git a/i18n/it/libopieui2.ts b/i18n/it/libopieui2.ts
index 5cd90be..5816733 100644
--- a/i18n/it/libopieui2.ts
+++ b/i18n/it/libopieui2.ts
@@ -1,816 +1,816 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Pulsante Agenda</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Pulsante ontatti</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Pulsante Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Pulsante Posta</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Pulsante Home</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Pulsante Registrazione</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Rotazione Display</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Basso+Sù</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Basso+Giù</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Basso+Destra</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Basso+Sinistra</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Alto+Sù</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Alto+Giù</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Alto+Destra</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Alto+Sinistra</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Tinta:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Sat:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Val:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Rosso:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Blu:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Alpha channel:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Seleziona colore</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Ancora</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Ancora...</translation>
     </message>
 </context>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>FileDialog</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Apri</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Salva</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nome:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Dimensione</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo Mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Medio</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Piccolo</translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation>Stile</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Dimensione</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>Cantami o Diva del pelide Achille l&apos;ira funesta</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">Nome</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Evento Ripetuto</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Nessuno</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Giorno</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Settimana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Mese</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Anno</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Ogni:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Frequenza</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Fine Il:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Indefinitivamente</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Ripeti Su</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mer</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Gio</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Ven</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Ogni</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Indefinitivamente</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">giorni</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">giorno</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">settimane</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">settimana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">mesi</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">mese</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">anni</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">anno</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">e</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 e </translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, e </translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Mai</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">giorno(i)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Ripeti Il</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Mer</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Gio</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Ven</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">settimana(e)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Ripeti Per</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Giorno</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">mese(i)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">anno(i)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Ogni</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">su</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Orario:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Scegli l&apos;Orario:</translation>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Dimensione</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Tipo Mime</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Nome:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">Nome</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Dimensione</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo Mime</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation type="obsolete">Descrizione:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Priorità:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Avanzamento:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">Scadenza:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Categoria:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Indirizzo Ufficio:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Indirizzo Casa:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">Telefono Casa: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">Fax Casa: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">Cellulare Casa: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">Pagina Web Casa: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">Pagina Web Ufficio: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">Ufficio: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">Telefono Ufficio: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">Fax Ufficio: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">Cellulare Ufficio: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">Cercapersone Ufficio: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="obsolete">Professione: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="obsolete">Assistente: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="obsolete">Direttore: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="obsolete">Maschile</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="obsolete">Femminile</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="obsolete">Sesso: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="obsolete">Coniuge: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="obsolete">Compleanno: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="obsolete">Anniversario: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation type="obsolete">Alias: </translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="obsolete">Email Principale: </translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="obsolete">Tutte le Email: </translation>
     </message>
     <message>
         <source>Children: </source>
         <translation type="obsolete">Figli: </translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="obsolete">Note:</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation type="obsolete">Inizio:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation type="obsolete">Fine:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation type="obsolete">Nota:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Ogni</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="obsolete">%1 %2 ogni </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="obsolete">Il %1 ogni </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="obsolete">Il %1 %1 di ogni</translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="obsolete">Ogni </translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="obsolete">Lunedì</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="obsolete">Martedì</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="obsolete">Mercoledì</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="obsolete">Giovedì</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="obsolete">Venerdì</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="obsolete">Sabato</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="obsolete">Domenica</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documenti</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>File</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Tutti i File</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="obsolete">Molto alta</translation>
     </message>
     <message>
         <source>High</source>
         <translation type="obsolete">Alta</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">Normale</translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="obsolete">Bassa</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="obsolete">Molto bassa</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="obsolete">Ubicazione:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation type="obsolete">Evento per tutto il giorno</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation type="obsolete">Evento per molti giorni</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Indirizzo Ufficio:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Indirizzo Casa:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation type="obsolete">Il %1 %2 di ogni</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Nessuno</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="obsolete">°</translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="obsolete">°</translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="obsolete">°</translation>
     </message>
     <message>
         <source>th</source>
         <translation type="obsolete">°</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/libopieui2.ts b/i18n/ja/libopieui2.ts
index 51a5983..a40cb08 100644
--- a/i18n/ja/libopieui2.ts
+++ b/i18n/ja/libopieui2.ts
@@ -1,175 +1,175 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/libopieui2.ts b/i18n/ko/libopieui2.ts
index 51a5983..a40cb08 100644
--- a/i18n/ko/libopieui2.ts
+++ b/i18n/ko/libopieui2.ts
@@ -1,175 +1,175 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/libopieui2.ts b/i18n/lv/libopieui2.ts
index 51a5983..a40cb08 100644
--- a/i18n/lv/libopieui2.ts
+++ b/i18n/lv/libopieui2.ts
@@ -1,175 +1,175 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libopiepim2.ts b/i18n/mk/libopiepim2.ts
index c2311ef..043e420 100644
--- a/i18n/mk/libopiepim2.ts
+++ b/i18n/mk/libopiepim2.ts
@@ -1,904 +1,904 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Коче календар</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">копче контакти</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">копје мени</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">копје порака</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Копче дома</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">копче сними</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">ротирање на екран</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Подредување:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Разместување:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Вредност:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Црвена:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Зелена:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Плава:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Алфа канал:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Избери боја</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Повеќе</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Повеќе...</translation>
     </message>
 </context>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="obsolete">Диалог на датотеки</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="obsolete">Отвори</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="obsolete">Сними</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Име:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Име</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Големина</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Дата</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Mime Тип</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Голем</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Среден</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Мал</translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="obsolete">Стил</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Големина</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="obsolete">Кафеавата лисица рипа преку мрзливото куче</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Повторувачки Настан</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Нињто</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Ден</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Недела</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Месец</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Година</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Секој:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Фрекфенција</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Настан на:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Нема краен датум</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Вклучи повторување</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Пон</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Втор</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Сред</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Чет</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Пет</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Саб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Нед</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Секој</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">Пром1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">Пром2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">НеделаПром</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Нема краен датум</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">денови</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">ден</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">недели</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">недела</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">месеци</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">месец</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">години</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">година</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">и</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">,
 и</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, и</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">Без повторување</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">денови</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Вклучи повторување</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Пон</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Втор</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Сред</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Чет</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Пет</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Саб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Нед</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">недели</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished">Повторувај по</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Ден</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished">месеци</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished">години</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Секој</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Повторувачки Настан</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Нињто</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Ден</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Недела</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Месец</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Година</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Секој:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Фрекфенција</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Настан на:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Нема краен датум</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Вклучи повторување</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Пон</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Втор</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Сред</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Чет</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Пет</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Саб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Нед</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Секој</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Пром1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Пром2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">НеделаПром</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Нема краен датум</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">денови</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">ден</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">недели</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">недела</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">месеци</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">месец</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">години</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">година</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">и</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 и</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, и</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Без повторување</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">денови</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Вклучи повторување</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Пон</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Втор</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Сред</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Чет</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Пет</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Саб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Нед</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">недели</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Повторувај по</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Ден</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">датум</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">месеци</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">години</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Секој</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Време:</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Одбери Време:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Документи</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">Датотеки</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="obsolete">Сите пораки</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished">Опис:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Приоритет:</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Многу високо</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Висок</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Нормално</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Низок</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Многу ниско</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Напредок:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Краен рок:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категорија:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Основна E-mail адреса:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Работна Адреса:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Канцеларија:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Службена интернет страна:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Службен Телефон:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Службен факс:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Службен Мобилен:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Службен Пејџер:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Домашна Адреса:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Приватна Интернет страна:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Домашен Телефон:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Домашен Факс:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Приватен Мобилен:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Сите електронски писма:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Професија:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Асистент:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Менаџер:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Машки</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Женски</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Пол:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Сопруг/Сопруга:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Роденден:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Годишнина:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Деца:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Надимак:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Забелешки:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Локација:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Ова е настан за цел ден</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Ова е настан од повеќе денови</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Старт:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Крај:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Забелешка:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Секој</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 секој</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1 секој</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="obsolete">%1 %1 од секој</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Секој</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Понеделник</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Вторник</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Среда</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Четврток</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Петок</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Сабота</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Недела</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation type="unfinished">%1 %2 од секој</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
diff --git a/i18n/mk/libopieui2.ts b/i18n/mk/libopieui2.ts
index e0c137b..0ecc001 100644
--- a/i18n/mk/libopieui2.ts
+++ b/i18n/mk/libopieui2.ts
@@ -1,767 +1,767 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Коче календар</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">копче контакти</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">копје мени</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">копје порака</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Копче дома</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">копче сними</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">ротирање на екран</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Подредување:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Разместување:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Вредност:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Црвена:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Зелена:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Плава:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Алфа канал:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Избери боја</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Повеќе</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Повеќе...</translation>
     </message>
 </context>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>Диалог на датотеки</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Отвори</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Сними</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Име:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Име</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Големина</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Дата</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Mime Тип</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Голем</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Среден</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Мал</translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation>Стил</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Големина</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>Кафеавата лисица рипа преку мрзливото куче</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">Име</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Повторувачки Настан</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Нињто</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Ден</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Недела</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Месец</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Година</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Секој:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Фрекфенција</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Настан на:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Нема краен датум</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Вклучи повторување</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Пон</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Втор</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Сред</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Чет</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Пет</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Саб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Нед</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Секој</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Пром1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Пром2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">НеделаПром</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Нема краен датум</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">денови</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">ден</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">недели</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">недела</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">месеци</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">месец</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">години</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">година</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">и</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 и</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, и</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Без повторување</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">денови</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Вклучи повторување</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Пон</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Втор</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Сред</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Чет</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Пет</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Саб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Нед</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">недели</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Повторувај по</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Ден</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">датум</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">месеци</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">години</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Секој</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Време:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Одбери Време:</translation>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Име</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Големина</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Mime Тип</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Име:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">Име</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Име</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Големина</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Mime Тип</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation>Документи</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Датотеки</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Сите пораки</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="obsolete">Опис:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Приоритет:</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="obsolete">Многу високо</translation>
     </message>
     <message>
         <source>High</source>
         <translation type="obsolete">Висок</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">Нормално</translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="obsolete">Низок</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="obsolete">Многу ниско</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Напредок:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">Краен рок:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Категорија:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="obsolete">Основна E-mail адреса:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Работна Адреса:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">Канцеларија:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">Службена интернет страна:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">Службен Телефон:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">Службен факс:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">Службен Мобилен:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">Службен Пејџер:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Домашна Адреса:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">Приватна Интернет страна:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">Домашен Телефон:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">Домашен Факс:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">Приватен Мобилен:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="obsolete">Сите електронски писма:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="obsolete">Професија:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="obsolete">Асистент:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="obsolete">Менаџер:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="obsolete">Машки</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="obsolete">Женски</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="obsolete">Пол:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="obsolete">Сопруг/Сопруга:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="obsolete">Роденден:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="obsolete">Годишнина:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation type="obsolete">Деца:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation type="obsolete">Надимак:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="obsolete">Забелешки:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="obsolete">Локација:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation type="obsolete">Ова е настан за цел ден</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation type="obsolete">Ова е настан од повеќе денови</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation type="obsolete">Старт:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation type="obsolete">Крај:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation type="obsolete">Забелешка:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Секој</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="obsolete">%1 %2 секој</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="obsolete">%1 секој</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="obsolete">%1 %1 од секој</translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="obsolete">Секој</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="obsolete">Понеделник</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="obsolete">Вторник</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="obsolete">Среда</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="obsolete">Четврток</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="obsolete">Петок</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="obsolete">Сабота</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="obsolete">Недела</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation type="obsolete">%1 %2 од секој</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Нињто</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="obsolete">st</translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="obsolete">nd</translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="obsolete">rd</translation>
     </message>
     <message>
         <source>th</source>
         <translation type="obsolete">th</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/libopiepim2.ts b/i18n/nl/libopiepim2.ts
index 1af294f..fc2ffcf 100644
--- a/i18n/nl/libopiepim2.ts
+++ b/i18n/nl/libopiepim2.ts
@@ -1,936 +1,936 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Kalenderknop</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Contaktenknop</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Menuknop</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Mailknop</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Thuisknop</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Opnameknop</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Beeldschermrotatie</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Lager en omhoog</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Lager en omlaag</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Lager en naar rechts</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Lager en naar links</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Hoger en omhoog</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Hoger en omlaag</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Hoger en naar rechts</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Hoger en naar links</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Kleur:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Verz:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Waarde:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Rood:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Groen:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Blauw:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Alpha kanaal:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Selecteer kleur</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Meer</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Meer...</translation>
     </message>
 </context>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="obsolete">Bestandsdialoog</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="obsolete">Open</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="obsolete">Sla op</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Naam:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Naam</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Grootte</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Mime Type</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Groot</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Middel</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Klein</translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="obsolete">Stijl</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Grootte</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="obsolete">The Quick Brown Fox Jumps Over The Lazy Dog</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Terugkerende gebeurtenis</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Geen</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Week</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Maand</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Jaar</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Iedere:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Frequentie</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Beeindig op:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Geen einddatum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Herhaal op</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Ma</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Wo</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Vr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Za</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Zo</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Iedere</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var 1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation>Geen einddatum</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dagen</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>weken</translation>
     </message>
     <message>
         <source>week</source>
         <translation>week</translation>
     </message>
     <message>
         <source>months</source>
         <translation>maanden</translation>
     </message>
     <message>
         <source>month</source>
         <translation>maand</translation>
     </message>
     <message>
         <source>years</source>
         <translation>jaren</translation>
     </message>
     <message>
         <source>year</source>
         <translation>jaar</translation>
     </message>
     <message>
         <source> and </source>
         <translation>en</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
  en</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, en</translation>
     </message>
     <message>
         <source>on </source>
         <translation>op</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation>Geen herhaling</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dag(en)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Herhaal op</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Ma</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Wo</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Vr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Za</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Zo</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>we(e)k(en)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Herhaal op</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>maand(en)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>ja(a)r(en)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Iedere</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Terugkerende gebeurtenis</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Geen</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Week</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Maand</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Jaar</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Iedere:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Frequentie</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Beeindig op:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Geen einddatum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Herhaal op</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Ma</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Wo</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Vr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Za</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Zo</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Iedere</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var 1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Geen einddatum</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">dagen</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">dag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">weken</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">week</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">maanden</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">maand</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">jaren</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">jaar</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">en</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
  en</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, en</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">op</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Geen herhaling</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">dag(en)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Herhaal op</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Ma</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Wo</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Vr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Za</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Zo</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">we(e)k(en)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Herhaal op</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">maand(en)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">ja(a)r(en)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Iedere</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Tijd:</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Kies tijd:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Documenten</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">Bestanden</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="obsolete">Alle bestanden</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Omschrijving:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioriteit:</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Heel hoog</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Hoog</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normaal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Laag</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Heel laag</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Voortgang:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Einddatum:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Standaard email:</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Bedrijfsadres:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Bedrijf:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Bedrijfswebpagina:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Bedrijfs telefoon:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Bedrijfs fax:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Bedrijfs mobiel:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Bedrijfs pieper:</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Priveadres:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Prive webpagina:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Prive telefoon:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Prive Fax:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Prive mobiel:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Alle Emails:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Beroep:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistent:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Manager:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Man</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Vrouw</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Geslacht:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Wederhelft:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Verjaardag:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Jaardag:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Kinderen:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Bijnaam:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notities:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Plaats:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Deze gebeurtenis duurt de hele dag</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Deze gebeurtenis duurt meerdere dagen</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Start:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Eind:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Notities:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Iedere</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 iedere</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>De %1 iedere</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>De %1 %2 van iedere</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Iedere</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Maandag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Dinsdag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Woensdag</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Donderdag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Vrijdag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Zaterdag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Zondag</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;br&gt;&lt;b&gt;Werkadres:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;br&gt;&lt;b&gt;Prive-adres:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>User Id</source>
         <translation>Gebruikers Id</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Kategorieen</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Naam Titel</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Voornaam</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Tussenvoegsel</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Achternaam</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Achtervoegsel</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Opslaan als</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Functienaam</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Afdeling</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Bedrijf</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Bedrijfs telefoon</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Bedrijfs fax</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Bedrijfs mobiel</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Standaard email</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Emails</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Prive telefoon</translation>
     </message>
     <message>
         <source>Home Fax</source>
diff --git a/i18n/nl/libopieui2.ts b/i18n/nl/libopieui2.ts
index 6899eb2..f08a207 100644
--- a/i18n/nl/libopieui2.ts
+++ b/i18n/nl/libopieui2.ts
@@ -1,862 +1,862 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Kalenderknop</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Contaktenknop</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Menuknop</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Mailknop</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Thuisknop</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Opnameknop</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Beeldschermrotatie</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Lager en omhoog</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Lager en omlaag</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Lager en naar rechts</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Lager en naar links</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Hoger en omhoog</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Hoger en omlaag</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Hoger en naar rechts</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Hoger en naar links</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Kleur:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Verz:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Waarde:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Rood:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Groen:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Blauw:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Alpha kanaal:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Selecteer kleur</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Meer</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Meer...</translation>
     </message>
 </context>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>Bestandsdialoog</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Open</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Sla op</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Naam:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Naam</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Grootte</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Mime Type</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Groot</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Middel</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Klein</translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation>Stijl</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Grootte</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>The Quick Brown Fox Jumps Over The Lazy Dog</translation>
     </message>
 </context>
 <context>
     <name>OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="obsolete">Stel sleutel in</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="obsolete">Pixmap</translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">Naam</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="obsolete">Sleutel</translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="obsolete">Standaardsleutel</translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="obsolete">Sneltoets voor geselecteerde actie</translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="obsolete">Gee&amp;n</translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="obsolete">Stan&amp;daard</translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="obsolete">&amp;Aangepast</translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="obsolete">Stel sleutel in</translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="obsolete">Standaard:</translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="obsolete">Sleutel staat op de zwarte lijst</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;De gekozen sleutel staat op de zwarte lijst en mag niet worden gebruikt, Kies een andere sleutel a.u.b.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="obsolete">Sleutel is al toegekend</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;De gekozen sleutel is al door een andere functie in gebruik, Kies een andere sleutel a.u.b.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Terugkerende gebeurtenis</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Geen</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Week</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Maand</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Jaar</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Iedere:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Frequentie</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Beeindig op:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Geen einddatum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Herhaal op</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Ma</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Wo</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Vr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Za</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Zo</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Iedere</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var 1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Geen einddatum</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">dagen</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">dag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">weken</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">week</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">maanden</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">maand</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">jaren</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">jaar</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">en</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
  en</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, en</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">op</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Geen herhaling</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">dag(en)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Herhaal op</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Ma</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Wo</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Vr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Za</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Zo</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">we(e)k(en)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Herhaal op</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">maand(en)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">ja(a)r(en)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Iedere</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Tijd:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Kies tijd:</translation>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation>OTimePickerDialogBase</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Naam</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Grootte</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Mime Type</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished">Stel sleutel in</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished">Pixmap</translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">Naam</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished">Sleutel</translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished">Standaardsleutel</translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished">Sneltoets voor geselecteerde actie</translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished">Gee&amp;n</translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished">Stan&amp;daard</translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished">&amp;Aangepast</translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished">Stel sleutel in</translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished">Standaard:</translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished">Sleutel staat op de zwarte lijst</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished">&lt;qt&gt;De gekozen sleutel staat op de zwarte lijst en mag niet worden gebruikt, Kies een andere sleutel a.u.b.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished">Sleutel is al toegekend</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished">&lt;qt&gt;De gekozen sleutel is al door een andere functie in gebruik, Kies een andere sleutel a.u.b.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Naam</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Grootte</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Mime Type</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation>Documenten</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Bestanden</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Alle bestanden</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="obsolete">Omschrijving:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Prioriteit:</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="obsolete">Heel hoog</translation>
     </message>
     <message>
         <source>High</source>
         <translation type="obsolete">Hoog</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">Normaal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="obsolete">Laag</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="obsolete">Heel laag</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Voortgang:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">Einddatum:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Kategorie:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="obsolete">Standaard email:</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Bedrijfsadres:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">Bedrijf:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">Bedrijfswebpagina:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">Bedrijfs telefoon:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">Bedrijfs fax:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">Bedrijfs mobiel:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">Bedrijfs pieper:</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Priveadres:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">Prive webpagina:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">Prive telefoon:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">Prive Fax:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">Prive mobiel:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="obsolete">Alle Emails:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="obsolete">Beroep:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="obsolete">Assistent:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="obsolete">Manager:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="obsolete">Man</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="obsolete">Vrouw</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="obsolete">Geslacht:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="obsolete">Wederhelft:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="obsolete">Verjaardag:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="obsolete">Jaardag:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation type="obsolete">Kinderen:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation type="obsolete">Bijnaam:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="obsolete">Notities:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="obsolete">Plaats:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation type="obsolete">Deze gebeurtenis duurt de hele dag</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation type="obsolete">Deze gebeurtenis duurt meerdere dagen</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation type="obsolete">Start:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation type="obsolete">Eind:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation type="obsolete">Notities:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Iedere</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="obsolete">%1 %2 iedere</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="obsolete">De %1 iedere</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation type="obsolete">De %1 %2 van iedere</translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="obsolete">Iedere</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="obsolete">Maandag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="obsolete">Dinsdag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="obsolete">Woensdag</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="obsolete">Donderdag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="obsolete">Vrijdag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="obsolete">Zaterdag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="obsolete">Zondag</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Geen</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="obsolete">ste</translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="obsolete">de</translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="obsolete">de</translation>
     </message>
     <message>
         <source>th</source>
         <translation type="obsolete">de</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/libopieui2.ts b/i18n/no/libopieui2.ts
index 0f61518..d311189 100644
--- a/i18n/no/libopieui2.ts
+++ b/i18n/no/libopieui2.ts
@@ -1,175 +1,175 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libopiepim2.ts b/i18n/pl/libopiepim2.ts
index fb207e1..78d1359 100644
--- a/i18n/pl/libopiepim2.ts
+++ b/i18n/pl/libopiepim2.ts
@@ -1,936 +1,936 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Przycisk Kalendarz</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Przycisk Kontakty</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Przycisk Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Przycisk Poczta</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Przycisk Dom</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Przycisk Zapis</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Obrót ekranu</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Dolny+Góra</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Dolny+Dół</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Dolny+Prawo</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Dolny+Lewo</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Górny+Góra</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Górny+Dół</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Górny+Prawo</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Górny+Lewo</translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="obsolete">Przycisk Akcji</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="obsolete">Przycisk OK</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="obsolete">Przycisk Koniec</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Czerwień:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Zieleń:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Błękit:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Kanał alfa:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Wybierz kolor</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Więcej</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Wiecej...</translation>
     </message>
 </context>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="obsolete">Plik</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="obsolete">Otwórz</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="obsolete">Zapisz</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nazwa:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nazwa</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Rozmiar</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Typ Mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Duże</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Średnie</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Małe</translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="obsolete">Styl</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Rozmiar</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Zdarzenie powtarzalne</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Brak</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Dzień</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Tydzień</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Miesiąc</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Rok</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Co:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Częstotliwość</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Koniec:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Bez daty końcowej</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Powtarzaj używając</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">Śro</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Czw</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Pią</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Nie</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Co</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Bez daty końcowej</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">dni</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">dzień</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">tygodni</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">tydzień</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">miesięcy</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">miesiąc</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">lat</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">rok</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">i</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">,
 i</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, i</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">używając</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">Bez powtarzania</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">dzień (dni)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Powtarzaj używając</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">Śro</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Czw</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Pią</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Nie</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">tydzień(dnie)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished">Powtarzaj co</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Dzień</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished">mesiąc(e)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished">rok (lata)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Co</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Zdarzenie powtarzalne</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Brak</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dzień</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Tydzień</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Miesiąc</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Rok</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Co:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Częstotliwość</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Koniec:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Bez daty końcowej</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Powtarzaj używając</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Wto</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Śro</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Czw</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Pią</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Nie</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Co</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Bez daty końcowej</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">dni</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">dzień</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">tygodni</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">tydzień</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">miesięcy</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">miesiąc</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">lat</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">rok</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">i</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 i</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, i</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Bez powtarzania</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">dzień (dni)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Powtarzaj używając</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Wto</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Śro</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Czw</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Pią</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Nie</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">tydzień(dnie)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Powtarzaj co</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dzień</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">mesiąc(e)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">rok (lata)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Co</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">używając</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Czas:</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Wybierz czas:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
         <translation>Priorytet:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Postęp:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Koniec:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategoria:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Domyślny e-mail:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Biuro:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>WWW firma:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Tel. firma:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax firma:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Tel. kom. firma:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Pager firma:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Strona domowa:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Tel. dom:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax dom:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Tel. kom. dom:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Adresy e-mail:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Zawód:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Asystent:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Menadżer:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Mężczyzna</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Kobieta</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Płeć:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Partner:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Urodziny:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Rocznica:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Dzieci:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Przydomek:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notatki:</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Początek:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Koniec:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Notatka:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Co</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 każdego</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1 każdego</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Co</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Poniedziałek</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Wtorek</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Środa</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Czwartek</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Piątek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sobota</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Niedziela</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Dokumenty</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">Pliki</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="obsolete">Wszystkie pliki</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Bardzo wysoki</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Wysoki</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normalny</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Niski</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Bardzo niski</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lokacja:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Zdarzenie całodobowe</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Zdarzenie wielodniowe</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Adres firmowy:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Adres domowy:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>%1 %2 każdego</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Opis:</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;br&gt;&lt;b&gt;Adres służbowy:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;br&gt;&lt;b&gt;Adres domowy:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>User Id</source>
         <translation>ID użytkownika</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Tytuł</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Imię</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Drugie imię</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nazwisko</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Przyrostek</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Zapisz jako</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Tytuł służbowy</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Dział</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Firma</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Tel. firma</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax firma</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Tel. kom. firma</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Domyślny e-mail</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Adresy e-mail</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Tel. dom</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax dom</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Tel. kom. dom</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Ulica firma</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Miasto firma</translation>
     </message>
     <message>
         <source>Business State</source>
diff --git a/i18n/pl/libopieui2.ts b/i18n/pl/libopieui2.ts
index cf13b31..c152c89 100644
--- a/i18n/pl/libopieui2.ts
+++ b/i18n/pl/libopieui2.ts
@@ -1,940 +1,940 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Przycisk Kalendarz</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Przycisk Kontakty</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Przycisk Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Przycisk Poczta</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Przycisk Dom</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Przycisk Zapis</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Obrót ekranu</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Dolny+Góra</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Dolny+Dół</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Dolny+Prawo</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Dolny+Lewo</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Górny+Góra</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Górny+Dół</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Górny+Prawo</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Górny+Lewo</translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="obsolete">Przycisk Akcji</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="obsolete">Przycisk OK</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="obsolete">Przycisk Koniec</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Czerwień:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Zieleń:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Błękit:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Kanał alfa:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Wybierz kolor</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Więcej</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Wiecej...</translation>
     </message>
 </context>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>Plik</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Otwórz</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Zapisz</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nazwa:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nazwa</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Rozmiar</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Typ Mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Duże</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Średnie</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Małe</translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation>Styl</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Rozmiar</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">Nazwa</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Zdarzenie powtarzalne</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Brak</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dzień</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Tydzień</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Miesiąc</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Rok</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Co:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Częstotliwość</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Koniec:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Bez daty końcowej</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Powtarzaj używając</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Wto</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Śro</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Czw</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Pią</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Nie</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Co</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Bez daty końcowej</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">dni</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">dzień</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">tygodni</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">tydzień</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">miesięcy</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">miesiąc</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">lat</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">rok</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">i</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 i</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, i</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Bez powtarzania</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">dzień (dni)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Powtarzaj używając</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Wto</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Śro</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Czw</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Pią</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Nie</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">tydzień(dnie)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Powtarzaj co</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dzień</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">mesiąc(e)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">rok (lata)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Co</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">używając</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Czas:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Wybierz czas:</translation>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Nazwa</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Rozmiar</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Typ Mime</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Nazwa:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">Nazwa</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nazwa</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Rozmiar</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Typ Mime</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Priorytet:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Postęp:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">Koniec:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Kategoria:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="obsolete">Domyślny e-mail:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">Biuro:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">WWW firma:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">Tel. firma:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">Fax firma:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">Tel. kom. firma:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">Pager firma:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">Strona domowa:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">Tel. dom:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">Fax dom:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">Tel. kom. dom:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="obsolete">Adresy e-mail:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="obsolete">Zawód:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="obsolete">Asystent:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="obsolete">Menadżer:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="obsolete">Mężczyzna</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="obsolete">Kobieta</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="obsolete">Płeć:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="obsolete">Partner:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="obsolete">Urodziny:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="obsolete">Rocznica:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation type="obsolete">Dzieci:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation type="obsolete">Przydomek:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="obsolete">Notatki:</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation type="obsolete">Początek:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation type="obsolete">Koniec:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation type="obsolete">Notatka:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Co</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="obsolete">%1 %2 każdego</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="obsolete">%1 każdego</translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="obsolete">Co</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="obsolete">Poniedziałek</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="obsolete">Wtorek</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="obsolete">Środa</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="obsolete">Czwartek</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="obsolete">Piątek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="obsolete">Sobota</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="obsolete">Niedziela</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumenty</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Pliki</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Wszystkie pliki</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="obsolete">Bardzo wysoki</translation>
     </message>
     <message>
         <source>High</source>
         <translation type="obsolete">Wysoki</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">Normalny</translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="obsolete">Niski</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="obsolete">Bardzo niski</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="obsolete">Lokacja:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation type="obsolete">Zdarzenie całodobowe</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation type="obsolete">Zdarzenie wielodniowe</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Adres firmowy:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Adres domowy:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation type="obsolete">%1 %2 każdego</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="obsolete">Opis:</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;b&gt;Adres służbowy:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;b&gt;Adres domowy:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>User Id</source>
         <translation type="obsolete">ID użytkownika</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Tytuł</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Imię</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="obsolete">Drugie imię</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Nazwisko</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="obsolete">Przyrostek</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Zapisz jako</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="obsolete">Tytuł służbowy</translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="obsolete">Dział</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Firma</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="obsolete">Tel. firma</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="obsolete">Fax firma</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="obsolete">Tel. kom. firma</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Domyślny e-mail</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">Adresy e-mail</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="obsolete">Tel. dom</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="obsolete">Fax dom</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="obsolete">Tel. kom. dom</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="obsolete">Ulica firma</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="obsolete">Miasto firma</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="obsolete">Region firma</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="obsolete">Kod poczt. firma</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="obsolete">Kraj firma</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="obsolete">Pager firma</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="obsolete">WWW firma</translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="obsolete">Biuro</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="obsolete">Zawód</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="obsolete">Asystent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="obsolete">Menadżer</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="obsolete">Ulica dom</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="obsolete">Miasto dom</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="obsolete">Region dom</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="obsolete">Kod poczt. dom</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="obsolete">Kraj dom</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="obsolete">Strona domowa</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="obsolete">Partner</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Płeć</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="obsolete">Urodziny</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="obsolete">Rocznica</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="obsolete">Przydomek</translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="obsolete">Dzieci</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notatki</translation>
     </message>
     <message>
         <source>None</source>
diff --git a/i18n/pt/libopiepim2.ts b/i18n/pt/libopiepim2.ts
index dfc1fde..4c705ad 100644
--- a/i18n/pt/libopiepim2.ts
+++ b/i18n/pt/libopiepim2.ts
@@ -1,936 +1,936 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Botão do Calendário</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Botão de Contactos</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Botão do Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Botão do E-Mail</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Botão do Início</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Botão de Gravação</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Mostrar Rodar</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Em Baixo+Cima</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Em Baixo+Baixo</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Em Baixo+Direita</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Em Baixo+Esquerda</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Em Cima+Cima</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Em Cima+Baixo</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Em Cima+Direita</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Em Cima+Esquerda</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Cor:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Sat:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Val:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Vermelho:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Azul:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Canal Alfa:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Escolha cor</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Mais</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Mais...</translation>
     </message>
 </context>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="obsolete">DiálogoFicheiro</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="obsolete">Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="obsolete">Gravar</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nome:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo de Conteúdo</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Médio</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Pequeno</translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="obsolete">Estilo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Tamanho</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="obsolete">A Rápida Raposa Castanha Salta Sobre O Cão Molenga</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Evento Repetitivo</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Nenhum</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Dia</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Mês</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Ano</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Todos:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Frequência</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Termina Em:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Sem Data de Término</translation>
     </message>
     <message>
         <source>Repeat On</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>
     <message>
         <source>Every</source>
         <translation type="unfinished">Todos</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">SemanaVar</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Sem Data de Término</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">dias</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">dia</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">meses</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">mês</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">anos</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">ano</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">e</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">,
 e</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, e</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">em</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">Sem Repetição</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">dia(s)</translation>
     </message>
     <message>
         <source>Repeat On</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>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished">Repetir Por</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Dia</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished">mês(es)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished">ano(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Todos</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Evento Repetitivo</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Nenhum</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dia</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Mês</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Ano</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Todos:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Frequência</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Termina Em:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sem Data de Término</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repete Em</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Todos</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">SemanaVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sem Data de Término</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">dias</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">dia</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">meses</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">mês</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">anos</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">ano</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">e</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 e</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, e</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Sem Repetição</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">dia(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repetir Em</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Repetir Por</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dia</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">mês(es)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">ano(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Todos</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">em</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Hora:</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Escolha Hora:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation type="unfinished">Descrição:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioridade:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Progresso:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Prazo:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>E-Mail por Omissão:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Endereço Trabalho:&lt;/b&gt; </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Emprego:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Site Web Emprego:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Telefone Emprego:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax Emprego:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Telemóvel Emprego:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Pager Emprego:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Endereço Casa:&lt;/b&gt; </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Site Web Pessoal:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Telefone Pessoal:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax Pessoal:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Telemóvel Pessoal:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Todos os E-Mails:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profissão:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistente:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Gestor:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Masculino</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Feminino</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Género:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Esposa:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Data Nascimento:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Aniversário:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Filhos:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Alcunha:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Início:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Fim:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Nota:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>todos %1 %2 </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Todos os %1</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="obsolete">Todos os %1 %1</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Segunda</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Terça</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Quarta</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Quinta</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Sexta</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Documentos</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">Ficheiros</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="obsolete">Todos os Ficheiros</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Muito Alto</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Alto</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Baixo</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Muito Baixo</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Localização:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Este é um evento para o dia todo</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Este é um evento para vários dias</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Endereço (emprego):&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Endereço (pessoal):&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>Todos os %1 %2</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
diff --git a/i18n/pt/libopieui2.ts b/i18n/pt/libopieui2.ts
index 761cdeb..faee6c4 100644
--- a/i18n/pt/libopieui2.ts
+++ b/i18n/pt/libopieui2.ts
@@ -1,796 +1,796 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Botão do Calendário</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Botão de Contactos</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Botão do Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Botão do E-Mail</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Botão do Início</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Botão de Gravação</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Mostrar Rodar</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Em Baixo+Cima</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Em Baixo+Baixo</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Em Baixo+Direita</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Em Baixo+Esquerda</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Em Cima+Cima</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Em Cima+Baixo</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Em Cima+Direita</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Em Cima+Esquerda</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Cor:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Sat:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Val:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Vermelho:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Azul:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Canal Alfa:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Escolha cor</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Mais</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Mais...</translation>
     </message>
 </context>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>DiálogoFicheiro</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Gravar</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nome:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo de Conteúdo</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Médio</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Pequeno</translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation>Estilo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>A Rápida Raposa Castanha Salta Sobre O Cão Molenga</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">Nome</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Evento Repetitivo</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Nenhum</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dia</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Mês</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Ano</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Todos:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Frequência</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Termina Em:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sem Data de Término</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repete Em</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Todos</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">SemanaVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sem Data de Término</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">dias</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">dia</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">meses</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">mês</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">anos</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">ano</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">e</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 e</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, e</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Sem Repetição</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">dia(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repetir Em</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Repetir Por</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dia</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">mês(es)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">ano(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Todos</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">em</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Hora:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Escolha Hora:</translation>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Tipo de Conteúdo</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Nome:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">Nome</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo de Conteúdo</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation type="obsolete">Descrição:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Prioridade:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Progresso:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">Prazo:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Categoria:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="obsolete">E-Mail por Omissão:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Endereço Trabalho:&lt;/b&gt; </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">Emprego:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">Site Web Emprego:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">Telefone Emprego:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">Fax Emprego:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">Telemóvel Emprego:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">Pager Emprego:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Endereço Casa:&lt;/b&gt; </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">Site Web Pessoal:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">Telefone Pessoal:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">Fax Pessoal:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">Telemóvel Pessoal:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="obsolete">Todos os E-Mails:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="obsolete">Profissão:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="obsolete">Assistente:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="obsolete">Gestor:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="obsolete">Masculino</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="obsolete">Feminino</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="obsolete">Género:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="obsolete">Esposa:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="obsolete">Data Nascimento:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="obsolete">Aniversário:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation type="obsolete">Filhos:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation type="obsolete">Alcunha:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="obsolete">Notas:</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation type="obsolete">Início:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation type="obsolete">Fim:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation type="obsolete">Nota:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Todos</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="obsolete">todos %1 %2 </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="obsolete">Todos os %1</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="obsolete">Todos os %1 %1</translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="obsolete">Todos</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="obsolete">Segunda</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="obsolete">Terça</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="obsolete">Quarta</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="obsolete">Quinta</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="obsolete">Sexta</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="obsolete">Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="obsolete">Domingo</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Ficheiros</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Todos os Ficheiros</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="obsolete">Muito Alto</translation>
     </message>
     <message>
         <source>High</source>
         <translation type="obsolete">Alto</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="obsolete">Baixo</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="obsolete">Muito Baixo</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="obsolete">Localização:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation type="obsolete">Este é um evento para o dia todo</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation type="obsolete">Este é um evento para vários dias</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Endereço (emprego):&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Endereço (pessoal):&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation type="obsolete">Todos os %1 %2</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Nenhum</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libopiepim2.ts b/i18n/pt_BR/libopiepim2.ts
index 3513725..d0cb6e4 100644
--- a/i18n/pt_BR/libopiepim2.ts
+++ b/i18n/pt_BR/libopiepim2.ts
@@ -1,936 +1,936 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Botão Claendário</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Botão Contatos</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Botão Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Botão Correio</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Botão Início</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Botão Gravar</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Rotação da Tela</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Inferior+Cima</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Inferior+Baixo</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Inferior+Direita</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Inferior+Esquerda</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Superior+Cima</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Superior+Baixo</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Superior+Direita</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Superior+Esquerda</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Mat:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Sat:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Val:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Verm:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Azul:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Canal Alfa:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Selecione a cor</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Mais</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Mais...</translation>
     </message>
 </context>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="obsolete">DiálogoArquivo</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="obsolete">Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="obsolete">Salvar</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nome:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo Mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Média</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Pequena</translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="obsolete">Estilo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Tamanho</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="obsolete">The Quick Brown Fox Jumps Over The Lazy Dog</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Evento com Repetição</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Nenhum</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Dia</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Mês</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Ano</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">
 A cada:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Frequência</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Termina Em:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Sem Data Final</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Repete Em</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>
     <message>
         <source>Every</source>
         <translation type="unfinished">A cada</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">Sem Data Final</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">dias</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">dia</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">meses</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">mês</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">anos</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">ano</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">e</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">,
 e</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">, e</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">na(o)</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">Sem repetição</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">dia(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">Repete Em</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>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished">Repete por</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Dia</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished">mês(es)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished">ano(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">A cada</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Evento com Repetição</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Nenhum</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dia</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Mês</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Ano</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">
 A cada:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Frequência</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Termina Em:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sem Data Final</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repete Em</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">A cada</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sem Data Final</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">dias</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">dia</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">meses</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">mês</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">anos</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">ano</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">e</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 e</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, e</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Sem repetição</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">dia(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repete Em</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Repete por</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dia</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">mês(es)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">ano(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">A cada</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">na(o)</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Hora:</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Escolha a Hora:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
         <translation>Prioridade:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Progresso:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Prazo:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>E-mail Padrão:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Escritório:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Página Web Comercial:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Telefone Comercial:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax Comercial:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Celular Comercial:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Pager Comercial:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Pagina Web Pessoal:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Telefone Residencial:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax Residencial:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Celular Pessoal:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Todos os E-mails:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profissão:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistente:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Gerente:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Masculino</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Feminino</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Sexo:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Conjuge:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Aniversário:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Casamento:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Crianças:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Apelido:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Inicio:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Fim:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Nota:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>A cada</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 a cada</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>No(a) %1 de cada</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>A Cada</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Segunda</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Terça</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Quarta</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Quinta</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Sexta</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Documentos</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">Arquivos</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="obsolete">Todos os arquivos</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Muito Alto</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Alto</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Baixo</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Muito Baixo</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Localização:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Este evento dura todo o dia</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Este evento dura vários dias</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Endereço Profissional:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Endereço Residencial:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>No(a) %1 de cada </translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/pt_BR/libopieui2.ts b/i18n/pt_BR/libopieui2.ts
index 57463df..3727c21 100644
--- a/i18n/pt_BR/libopieui2.ts
+++ b/i18n/pt_BR/libopieui2.ts
@@ -1,800 +1,800 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Botão Claendário</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Botão Contatos</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Botão Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Botão Correio</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Botão Início</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Botão Gravar</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Rotação da Tela</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Inferior+Cima</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Inferior+Baixo</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Inferior+Direita</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Inferior+Esquerda</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Superior+Cima</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Superior+Baixo</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Superior+Direita</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Superior+Esquerda</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Mat:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Sat:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">Val:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Verm:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Azul:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Canal Alfa:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Selecione a cor</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Mais</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Mais...</translation>
     </message>
 </context>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>DiálogoArquivo</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Salvar</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Nome:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo Mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Média</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Pequena</translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation>Estilo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>The Quick Brown Fox Jumps Over The Lazy Dog</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">Nome</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Evento com Repetição</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Nenhum</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dia</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Mês</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Ano</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">
 A cada:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Frequência</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Termina Em:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sem Data Final</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repete Em</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">A cada</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Sem Data Final</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">dias</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">dia</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">meses</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">mês</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">anos</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">ano</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">e</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 e</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, e</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Sem repetição</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">dia(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Repete Em</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Repete por</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dia</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">mês(es)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">ano(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">A cada</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">na(o)</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Hora:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Escolha a Hora:</translation>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">Tipo Mime</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Nome:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">Nome</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Tipo Mime</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Prioridade:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Progresso:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">Prazo:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Categoria:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="obsolete">E-mail Padrão:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">Escritório:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">Página Web Comercial:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">Telefone Comercial:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">Fax Comercial:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">Celular Comercial:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">Pager Comercial:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">Pagina Web Pessoal:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">Telefone Residencial:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">Fax Residencial:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">Celular Pessoal:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="obsolete">Todos os E-mails:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="obsolete">Profissão:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="obsolete">Assistente:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="obsolete">Gerente:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="obsolete">Masculino</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="obsolete">Feminino</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="obsolete">Sexo:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="obsolete">Conjuge:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="obsolete">Aniversário:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="obsolete">Casamento:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation type="obsolete">Crianças:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation type="obsolete">Apelido:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="obsolete">Notas:</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation type="obsolete">Inicio:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation type="obsolete">Fim:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation type="obsolete">Nota:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">A cada</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="obsolete">%1 %2 a cada</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="obsolete">No(a) %1 de cada</translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="obsolete">A Cada</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="obsolete">Segunda</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="obsolete">Terça</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="obsolete">Quarta</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="obsolete">Quinta</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="obsolete">Sexta</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="obsolete">Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="obsolete">Domingo</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Arquivos</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Todos os arquivos</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="obsolete">Muito Alto</translation>
     </message>
     <message>
         <source>High</source>
         <translation type="obsolete">Alto</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="obsolete">Baixo</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="obsolete">Muito Baixo</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="obsolete">Localização:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation type="obsolete">Este evento dura todo o dia</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation type="obsolete">Este evento dura vários dias</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Endereço Profissional:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Endereço Residencial:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation type="obsolete">No(a) %1 de cada </translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Nenhum</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="obsolete">º</translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="obsolete">º</translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="obsolete">º</translation>
     </message>
     <message>
         <source>th</source>
         <translation type="obsolete">º</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/libopiepim2.ts b/i18n/ru/libopiepim2.ts
index e64079a..89a1014 100644
--- a/i18n/ru/libopiepim2.ts
+++ b/i18n/ru/libopiepim2.ts
@@ -1,940 +1,940 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Кнопка &quot;Календарь&quot;</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Кнопка &quot;Контакты&quot;</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Кнопка меню</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Кнопка &quot;Почта&quot;</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Кнопка &quot;Домой&quot;</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Кнопка записи</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Повернуть дисплей</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Нижний+вверх</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Нижний+вниз</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Нижний+направо</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Нижний+налево</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Верхний+вверх</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Верхний+вниз</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Верхний+направо</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Верхний+налево</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="obsolete">Кнопка  ОК</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="obsolete">Кнопка &quot;End&quot;</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Тон:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Насыщ.:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Красный:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Зеленый:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Синий:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Альфа канал:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Выбрать цвет</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Далее</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Далее...</translation>
     </message>
 </context>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="obsolete">ФайлДиалог</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="obsolete">Открыть</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="obsolete">Сохранить</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Имя:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Имя</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Размер</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Дата</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Тип Mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Большой</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Средний</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Маленький</translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="obsolete">Стиль</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Размер</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="obsolete">А ещё хорошо уметь всем на зависть чётко и складно писать буквы и цифры!</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Повторяющееся событие</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Нет</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>День</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Неделя</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Месяц</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Год</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Каждый(е):</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Периодичность</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Завершить:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Нет даты</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Повторять по</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Пнд</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Втр</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Срд</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Чтв</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Птн</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Суб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Вск</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Каждые</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation>Нет даты</translation>
     </message>
     <message>
         <source>days</source>
         <translation>дней</translation>
     </message>
     <message>
         <source>day</source>
         <translation>день</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>недели</translation>
     </message>
     <message>
         <source>week</source>
         <translation>неделю</translation>
     </message>
     <message>
         <source>months</source>
         <translation>месяцев</translation>
     </message>
     <message>
         <source>month</source>
         <translation>месяц</translation>
     </message>
     <message>
         <source>years</source>
         <translation>лет</translation>
     </message>
     <message>
         <source>year</source>
         <translation>год</translation>
     </message>
     <message>
         <source> and </source>
         <translation>и</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 и</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, и</translation>
     </message>
     <message>
         <source>on </source>
         <translation>по</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation>Нет повтора</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>день(дней)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Повторять по</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Пнд</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Втр</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Срд</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Чтв</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Птн</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Суб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Вск</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>неделя(и)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Повтор</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>День</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>месяц(ев)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>год(а)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Каждые</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Повторяющееся</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Нет</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">День</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Неделя</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Месяц</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Год</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Каждый(е):</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Периодичность</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Завершить:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Нет даты</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Повторять по</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Пнд</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Втр</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Срд</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Чтв</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Птн</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Суб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Вск</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Каждый(е)</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Нет даты</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">дней</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">день</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">недели</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">неделя</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">месяцев</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">Месяц</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">лет</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">год</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">и</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 и</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, и</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Нет повтора</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">день(дней)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Повторять по</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Пнд</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Втр</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Срд</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Чтв</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Птн</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Суб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Вск</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">неделя(и)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Повтор</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">День</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Дата</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">месяц(ев)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">год(а)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Каждый(е)</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">по</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">Время:</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">Выбрать время:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
         <translation>Приоритет:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Прогресс:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Предел:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категория:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>E-mail по умолчанию:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Офис:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Раб. WEB-страница:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Раб. телефон:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Раб. факс:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Раб. моб.:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Раб. пейджер:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Дом. WEB-страница:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Дом. тел.:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Дом. факс:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Дом. моб.:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Все Email:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Профессия:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Помощник:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Управляющий:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Муж</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Жен</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Пол:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Супруг(а):</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>День рожд.:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Годовщина:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Дети:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Прозвище:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Заметки:</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Начало:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Окон.:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Заметка:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Каждые</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 кажд.</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1 каждые</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Каждые</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Понедельник</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Вторник</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Среда</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Четверг</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Пятница</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Суббота</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Воскресение</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Документы</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">Файлы</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="obsolete">Все файлы</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Очень высокий</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Высокий</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Нормальный</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Низкий</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Очень низкий</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Место:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Это событие на весь день</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Это событие на несколько дней</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Раб. адрес:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Дом. адрес:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>%1 %2 каждые</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Описание:</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;br&gt;&lt;b&gt;Раб. адрес:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;br&gt;&lt;b&gt;Дом. адрес:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>User Id</source>
         <translation>ID пользователя</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Категории</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Титул</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Имя</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Отчество</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Фамилия</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Суффикс</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Записать как</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Должность</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Отдел</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Организация</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Раб. телефон</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Раб. факс</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Раб. мобильный</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>E-mail по умолчанию</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Email адреса</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Дом. телефон</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Дом. факс</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Дом. мобильный</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Работа - улица</translation>
     </message>
     <message>
         <source>Business City</source>
diff --git a/i18n/ru/libopieui2.ts b/i18n/ru/libopieui2.ts
index 8525e49..ebc8992 100644
--- a/i18n/ru/libopieui2.ts
+++ b/i18n/ru/libopieui2.ts
@@ -1,944 +1,944 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">Кнопка &quot;Календарь&quot;</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">Кнопка &quot;Контакты&quot;</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">Кнопка меню</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">Кнопка &quot;Почта&quot;</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">Кнопка &quot;Домой&quot;</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">Кнопка записи</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">Повернуть дисплей</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">Нижний+вверх</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">Нижний+вниз</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">Нижний+направо</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">Нижний+налево</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">Верхний+вверх</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">Верхний+вниз</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">Верхний+направо</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">Верхний+налево</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="obsolete">Кнопка  ОК</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="obsolete">Кнопка &quot;End&quot;</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">Тон:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">Насыщ.:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">Красный:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">Зеленый:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">Синий:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">Альфа канал:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">Выбрать цвет</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">Далее</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">Далее...</translation>
     </message>
 </context>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>ФайлДиалог</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation>Выбрать каталог</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Имя:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Имя</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Размер</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Дата</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Тип Mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">Большой</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">Средний</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Маленький</translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation>Стиль</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>А ещё хорошо уметь всем на зависть чётко и складно писать буквы и цифры!</translation>
     </message>
 </context>
 <context>
     <name>OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="obsolete">Настроить ключ</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="obsolete">Изображение</translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">Имя</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="obsolete">Ключ</translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="obsolete">Ключ по умолчанию</translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="obsolete">Ссылка для выбранного действия</translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="obsolete">&amp;Нет</translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="obsolete">&amp;По умолчанию</translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="obsolete">&amp;Своя</translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="obsolete">Настроить ключ</translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="obsolete">По умолчанию:</translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="obsolete">Ключ в черном списке</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;Выбранный вами ключ находится в черном списке и не может быть использован с этим менеджером. Пожалуйста выберите другой ключ.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="obsolete">Ключ уже зарегистрирован</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="obsolete">&lt;qt&gt;Выбранный вами ключ уже используется в другом пункте вашей конфигурации. Пожалуйста выберите другой ключ.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Повторяющееся</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Нет</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">День</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Неделя</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Месяц</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Год</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Каждый(е):</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Периодичность</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Завершить:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Нет даты</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Повторять по</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Пнд</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Втр</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Срд</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Чтв</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Птн</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Суб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Вск</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Каждый(е)</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Нет даты</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">дней</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">день</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">недели</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">неделя</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">месяцев</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">Месяц</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">лет</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">год</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">и</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">,
 и</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">, и</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">Нет повтора</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">день(дней)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Повторять по</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Пнд</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Втр</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Срд</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Чтв</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Птн</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Суб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Вск</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">неделя(и)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">Повтор</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">День</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Дата</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">месяц(ев)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">год(а)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Каждый(е)</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">по</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Время:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Выбрать время:</translation>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation>Тип Mime</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation>Настроить ключ</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation>Изображение</translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation>Имя</translation>
     </message>
     <message>
         <source>Key</source>
         <translation>Ключ</translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation>Ключ по умолчанию</translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation>Ссылка для выбранного действия</translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation>&amp;Нет</translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation>&amp;По умолчанию</translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation>&amp;Своя</translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation>Настроить ключ</translation>
     </message>
     <message>
         <source>Default: </source>
         <translation>По умолчанию:</translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation>Ключ в черном списке</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Выбранный вами ключ находится в черном списке и не может быть использован с этим менеджером. Пожалуйста выберите другой ключ.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation>Ключ уже зарегистрирован</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Выбранный вами ключ уже используется в другом пункте вашей конфигурации. Пожалуйста выберите другой ключ.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">Имя</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Размер</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Дата</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">Тип Mime</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Приоритет:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Прогресс:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">Предел:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Категория:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="obsolete">E-mail по умолчанию:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">Офис:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">Раб. WEB-страница:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">Раб. телефон:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">Раб. факс:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">Раб. моб.:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">Раб. пейджер:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">Дом. WEB-страница:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">Дом. тел.:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">Дом. факс:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">Дом. моб.:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="obsolete">Все Email:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="obsolete">Профессия:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="obsolete">Помощник:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="obsolete">Управляющий:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="obsolete">Муж</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="obsolete">Жен</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="obsolete">Пол:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="obsolete">Супруг(а):</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="obsolete">День рожд.:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="obsolete">Годовщина:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation type="obsolete">Дети:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation type="obsolete">Прозвище:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="obsolete">Заметки:</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation type="obsolete">Начало:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation type="obsolete">Окон.:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation type="obsolete">Заметка:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Каждые</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="obsolete">%1 %2 кажд.</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="obsolete">%1 каждые</translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="obsolete">Каждые</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="obsolete">Понедельник</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="obsolete">Вторник</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="obsolete">Среда</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="obsolete">Четверг</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="obsolete">Пятница</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="obsolete">Суббота</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="obsolete">Воскресение</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Документы</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Файлы</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Все файлы</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="obsolete">Очень высокий</translation>
     </message>
     <message>
         <source>High</source>
         <translation type="obsolete">Высокий</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">Нормальный</translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="obsolete">Низкий</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="obsolete">Очень низкий</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="obsolete">Место:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation type="obsolete">Это событие на весь день</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation type="obsolete">Это событие на несколько дней</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Раб. адрес:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Дом. адрес:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation type="obsolete">%1 %2 каждые</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="obsolete">Описание:</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;b&gt;Раб. адрес:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;br&gt;&lt;b&gt;Дом. адрес:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>User Id</source>
         <translation type="obsolete">ID пользователя</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="obsolete">Категории</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Имя</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="obsolete">Отчество</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Фамилия</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="obsolete">Суффикс</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Записать как</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="obsolete">Должность</translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="obsolete">Отдел</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Организация</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="obsolete">Раб. телефон</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="obsolete">Раб. факс</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="obsolete">Раб. мобильный</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">E-mail по умолчанию</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">Email адреса</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="obsolete">Дом. телефон</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="obsolete">Дом. факс</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="obsolete">Дом. мобильный</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="obsolete">Работа - улица</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="obsolete">Работа - город</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="obsolete">Работа - область</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="obsolete">Работа - индекс</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="obsolete">Работа - страна</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="obsolete">Раб. пейджер</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="obsolete">Раб. WEB-страница</translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="obsolete">Офис</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="obsolete">Профессия</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="obsolete">Помощник</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="obsolete">Управляющий</translation>
diff --git a/i18n/sl/libopieui2.ts b/i18n/sl/libopieui2.ts
index c800f61..b0144db 100644
--- a/i18n/sl/libopieui2.ts
+++ b/i18n/sl/libopieui2.ts
@@ -1,318 +1,318 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Ponavljajoč dogodek
 </translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Brez</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dan</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">Teden</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">Mesec</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">Leto</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">Vasak:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">Pogostost</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">Konča na:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Brez končnega datuma</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Ponovi na</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Tor</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Sre</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Čet</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Pet</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Ned</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Vsak</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">Spremenljivka1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Spremenljivka 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">Tedenskaspremenljivka</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">Brez končnega datuma</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">Ponovi na</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">Tor</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">Sre</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">Čet</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">Pet</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">Ned</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">Dan</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Vsak</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Čas:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Izberi čas:</translation>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">Vsak</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Brez</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libopiepim2.ts b/i18n/xx/libopiepim2.ts
index 7e21f45..eec00db 100644
--- a/i18n/xx/libopiepim2.ts
+++ b/i18n/xx/libopiepim2.ts
@@ -1,936 +1,936 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>High</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/xx/libopieui2.ts b/i18n/xx/libopieui2.ts
index 10cedc7..0bf4f64 100644
--- a/i18n/xx/libopieui2.ts
+++ b/i18n/xx/libopieui2.ts
@@ -1,814 +1,814 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>OKeyConfigWidget</name>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>End:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>High</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>th</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libopieui2.ts b/i18n/zh_CN/libopieui2.ts
index 51a5983..a40cb08 100644
--- a/i18n/zh_CN/libopieui2.ts
+++ b/i18n/zh_CN/libopieui2.ts
@@ -1,175 +1,175 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libopieui2.ts b/i18n/zh_TW/libopieui2.ts
index 9f50322..80f30f5 100644
--- a/i18n/zh_TW/libopieui2.ts
+++ b/i18n/zh_TW/libopieui2.ts
@@ -1,313 +1,313 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OFileDialog</name>
+    <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Directory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OFontSelector</name>
+    <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">Repeating Event</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">無</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">日</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">星期</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">月份</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">年份</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">每:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">重復的</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">End On:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">No End Date</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">在某天重復</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">星期一</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">星期二</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">星期三</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">星期四</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">星期五</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">星期六</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">星期日</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">每</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">No End Date</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">在某天重復</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">星期一</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">星期二</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">星期三</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">星期四</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">星期五</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">星期六</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">星期日</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">日</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">每</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Time:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Pick Time:</translation>
     </message>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
         <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Every</source>
         <translation type="obsolete">每</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">無</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>