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
@@ -24,249 +24,249 @@
     <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>
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
@@ -24,253 +24,253 @@
     <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>
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,208 +1,208 @@
 <!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>
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,216 +1,216 @@
 <!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>
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
@@ -17,249 +17,249 @@
     <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>
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
@@ -17,253 +17,253 @@
     <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>
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,118 +1,118 @@
 <!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>
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,118 +1,118 @@
 <!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>
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
@@ -16,249 +16,249 @@
     <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>
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
@@ -16,253 +16,253 @@
     <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>
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
@@ -29,249 +29,249 @@
     <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>
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
@@ -29,253 +29,253 @@
     <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>
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,118 +1,118 @@
 <!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>
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
@@ -17,249 +17,249 @@
     <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>
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
@@ -17,253 +17,253 @@
     <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>
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,118 +1,118 @@
 <!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>
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,118 +1,118 @@
 <!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>
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,118 +1,118 @@
 <!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>
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,232 +1,232 @@
 <!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>
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,236 +1,236 @@
 <!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>
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
@@ -16,249 +16,249 @@
     <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>
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
@@ -16,253 +16,253 @@
     <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>
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,118 +1,118 @@
 <!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>
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
@@ -16,249 +16,249 @@
     <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>
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
@@ -16,253 +16,253 @@
     <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>
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
@@ -16,249 +16,249 @@
     <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>
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
@@ -16,253 +16,253 @@
     <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>
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
@@ -16,249 +16,249 @@
     <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>
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
@@ -16,253 +16,253 @@
     <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>
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
@@ -20,249 +20,249 @@
     <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>
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
@@ -20,253 +20,253 @@
     <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>
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,118 +1,118 @@
 <!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>
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
@@ -16,249 +16,249 @@
     <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>
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
@@ -16,253 +16,253 @@
     <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>
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,118 +1,118 @@
 <!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>
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,118 +1,118 @@
 <!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>